diff options
| author | Tim <timothyasir@gluster.com> | 2011-08-16 17:46:20 +0530 |
|---|---|---|
| committer | Tim <timothyasir@gluster.com> | 2011-08-16 17:46:20 +0530 |
| commit | 4c02769b4132224f6ff0b1b41d736fa1fec943fa (patch) | |
| tree | 292a0f0dc60d61020b110888617ddd36706fd530 /src | |
| parent | d9a6067b237dd08133598467e771fa62dc72d6a9 (diff) | |
Bug 3408 - [AMI] setsebool command not present in Gluster AMI
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py | 9 | ||||
| -rwxr-xr-x | src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py index 67ce962e..5d5187f4 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py @@ -85,10 +85,11 @@ def main(): sys.stderr.write("Failed to create samba configuration file %s: %s\n" % (Globals.REAL_SAMBA_CONF_FILE, str(e))) sys.exit(4) - if Utils.runCommand("setsebool -P samba_share_fusefs on") != 0: - Utils.log("failed to set SELinux samba_share_fusefs") - sys.stderr.write("failed to set SELinux samba_share_fusefs\n") - sys.exit(5) + if Utils.runCommand("/usr/sbin/selinuxenabled") == 0: + if Utils.runCommand("setsebool -P samba_share_fusefs on") != 0: + Utils.log("failed to set SELinux samba_share_fusefs") + sys.stderr.write("failed to set SELinux samba_share_fusefs\n") + sys.exit(5) if Utils.runCommand("service smb status") != 0: if Utils.runCommand("service smb start") != 0: diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py index 0d09b5eb..e16c87c2 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py @@ -33,10 +33,11 @@ def main(): Utils.log("Failed to create reexport link %s" % cifsDirName) sys.stderr.write("Failed to create reexport link %s\n" % cifsDirName) sys.exit(2) - if Utils.runCommand("chcon -t samba_share_t %s -h" % cifsDirName) != 0: - Utils.log("Failed to change security context for the link %s" % cifsDirName) - sys.stderr.write("Failed to change security context for the link %s\n" % cifsDirName) - sys.exit(2) + if Utils.runCommand("/usr/sbin/selinuxenabled") == 0: + if Utils.runCommand("chcon -t samba_share_t %s -h" % cifsDirName) != 0: + Utils.log("Failed to change security context for the link %s" % cifsDirName) + sys.stderr.write("Failed to change security context for the link %s\n" % cifsDirName) + sys.exit(2) if not VolumeUtils.includeVolume(volumeName): Utils.log("Failed to include volume for CIFS reexport") sys.stderr.write("Failed to include volume for CIFS reexport\n") |
