From b4eca2f985d8207183f15fccfc2f907737625097 Mon Sep 17 00:00:00 2001 From: Ambarish Date: Tue, 12 Sep 2017 18:34:29 +0530 Subject: ganesha-ha: don't set SELinux booleans if SELinux is disabled semanage commands inside ganesha-ha.sh script will fail if selinux is Disabled. This patch introduces a check if selinux is enabled or not, and subsequently run semange commands only on selinux enabled systems. Change-Id: Ibee61cbb1d51a73e6c326b49bac5c7ce06feb310 BUG: 1490909 Signed-off-by: Ambarish Reviewed-on: https://review.gluster.org/18264 Reviewed-by: Niels de Vos Smoke: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: jiffin tony Thottan Reviewed-by: Daniel Gryniewicz CentOS-regression: Gluster Build System --- extras/ganesha/scripts/ganesha-ha.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 5d3bf8413b8..2098b77975b 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -977,7 +977,9 @@ main() exit 0 fi - semanage boolean -m gluster_use_execmem --on + if (selinuxenabled) ;then + semanage boolean -m gluster_use_execmem --on + fi HA_CONFDIR=${1%/}; shift local ha_conf=${HA_CONFDIR}/ganesha-ha.conf @@ -1134,8 +1136,9 @@ $HA_CONFDIR/ganesha-ha.conf esac - semanage boolean -m gluster_use_execmem --off - + if (selinuxenabled) ;then + semanage boolean -m gluster_use_execmem --off + fi } main $* -- cgit