From 3459eda509d4254126b92c52f4d7e293fab489b6 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Mon, 18 Jul 2011 17:50:02 -0700
Subject: [PATCH] fix cloud-setup-agent, if selinux is disabled, should return
 successful, instead of raise an exception

---
 python/lib/cloudutils/serviceConfig.py | 7 ++++++-
 python/lib/cloudutils/utilities.py     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
index 881d88f1991..c10e674ea92 100644
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -20,6 +20,9 @@ class serviceCfgBase(object):
         result = False
         try:
             result = self.config()
+            if result is None:
+                result = False
+                
             self.status = result
             writeProgressBar(None, result)
             return result
@@ -369,7 +372,9 @@ class securityPolicyConfigRedhat(serviceCfgBase):
             except:
                 raise CloudRuntimeException("Failed to configure selinux, please see the /var/log/cloud/setupAgent.log for detail, \
                                             or you can manually disable it before starting myCloud")
-        
+        else:
+            return True
+    
     def restore(self):
         try:
             bash("setenforce 1")
diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py
index 30df9781001..c0b32480ae4 100644
--- a/python/lib/cloudutils/utilities.py
+++ b/python/lib/cloudutils/utilities.py
@@ -71,6 +71,7 @@ def initLoging(logFile=None):
         logging.basicConfig(level=logging.DEBUG) 
 
 def writeProgressBar(msg, result):
+    output = "[%-6s]\n"%"Failed"
     if msg is not None:
         output = "%-30s"%msg
     elif result is True: