diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py index 39a44586bd6..243bb408d41 100644 --- a/python/lib/cloud_utils.py +++ b/python/lib/cloud_utils.py @@ -314,6 +314,7 @@ def check_cgroups(): def check_selinux(): if distro not in [Fedora,CentOS,RHEL6]: return # no selinux outside of those enforcing = False + config_enforcing = False try: output = getenforce().stdout.strip() if "nforcing" in output: diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index 272ff8104e2..be54ff7c4d8 100755 --- a/setup/bindir/cloud-setup-databases.in +++ b/setup/bindir/cloud-setup-databases.in @@ -167,6 +167,10 @@ Sql parameters: '''%(table, e.__str__(), kwargs) self.errorAndExit(err) + def errorAndContinue(self, msg): + sys.stderr.write(msg) + sys.stderr.flush() + def errorAndExit(self, msg): self.postRun() err = '''\n\nWe apologize for below error: @@ -389,10 +393,13 @@ for example: try: check_selinux() except CheckFailed, e: - self.errorAndExit(e.__str__()) + self.info("checkSelinux failed with error continuing...", None) + self.errorAndContinue(e.__str__()) except OSError, e: if e.errno == 2: pass - else: self.errorAndExit(e.__str__()) + else: + self.info("checkSelinux failed with error continuing...", None) + self.errorAndContinue(e.__str__()) self.info(None, True) checkCloudDbFiles()