Bug 8275 - SELinux error message provides incorrect directions

frank-zhang · frank-zhang · commit c38aff60f475 · 2011-02-07T13:39:35.000-08:00
status 8275: resloved fixed
diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py
@@ -298,12 +298,22 @@ def check_selinux():
 		if "nforcing" in output:
 			enforcing = True
 		if any ( [ s.startswith("SELINUX=enforcing") for s in file("/etc/selinux/config").readlines() ] ):
-			enforcing = True
+			config_enforcing = True
+		else:
+			config_enforcing = False
 	except (IOError,OSError),e:
 		if e.errno == 2: pass
 		else: raise CheckFailed("An unknown error (%s) took place while checking for SELinux"%str(e))
 	if enforcing:
-		raise CheckFailed("SELinux is set to enforcing, please set it to permissive in /etc/selinux/config, then reboot the machine or type setenforce Permissive, after which you can run this program again.")
+		raise CheckFailed('''SELinux is set to enforcing. There are two options:
+1> Set it permissive in /etc/selinux/config, then reboot the machine.
+2> Type 'setenforce Permissive' in commandline, after which you can run this program again.
+
+We strongly suggest you doing the option 1 that makes sure SELinux goes into permissive after system reboot.\n''')
+
+	if config_enforcing:
+		print "WARNING: We detected that your SELinux is not configured in permissive. to make sure cloudstack won't block by \
+SELinux after system reboot, we strongly suggest you setting it in permissive in /etc/selinux/config, then reboot the machine."
 
 
 def preflight_checks(do_check_kvm=True):
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
@@ -216,8 +216,7 @@ def checkselinux():
 	try:
 		check_selinux()
 	except CheckFailed,e:
-		sys.stderr.write("SELINUX is set to enforcing, please set it to permissive in /etc/selinux/config\n")
-		sys.stderr.write("then reboot the machine, after which you can run this program again.\n")
+		sys.stderr.write(e.__str__())
 		sys.exit(3)
 
 def checknetwork():
