add check hostname during installation

edisonSu · edisonSu · commit 57fe38efcd78 · 2011-06-02T22:38:13.000-04:00
diff --git a/python/lib/cloudutils/syscfg.py b/python/lib/cloudutils/syscfg.py
@@ -72,8 +72,12 @@ def check(self):
             return True
 
         if os.geteuid() != 0:
-            raise CloudInternalException("Need to execute with root permission")
+            raise CloudInternalException("Need to execute with root permission\n")
         
+        hostname = bash("hostname -f")
+        if not hostname.isSuccess():
+            raise CloudInternalException("Checking hostname ... [Failed]\nPlease edit /etc/hosts, add a Fully Qualified Domain Name as your hostname\n")
+
         kvmEnabled = self.svo.isKVMEnabled()
         if not kvmEnabled:
             raise CloudInternalException("Checking KVM...[Failed]\nPlease enable KVM on this machine\n")
@@ -125,7 +129,7 @@ def check(self):
             raise CloudInternalException("Need to execute with root permission")
         hostname = bash("hostname -f")
         if not hostname.isSuccess():
-            raise CloudInternalException("Checking hostname ... [Failed]\nNeed to have a Fully Qualified Domain Name as your hostname")
+            raise CloudInternalException("Checking hostname ... [Failed]\nPlease edit /etc/hosts, add a Fully Qualified Domain Name as your hostname\n")
         return True
         
 class sysConfigServerRedhat(sysConfigServer):
