- only disable services that actually exist (rawdevices is deprecated in FC4)

[bootmanager.git] / source / steps / InstallNodeInit.py

diff --git a/source/steps/InstallNodeInit.py b/source/steps/InstallNodeInit.py
index df319bf..c0532d0 100644 (file)
--- a/source/steps/InstallNodeInit.py
+++ b/source/steps/InstallNodeInit.py
@@ -42,6 +42,7 @@
 
 from Exceptions import *
 import utils
+import os
 
 
 def Run( vars, log ):
@@ -53,6 +54,7 @@ def Run( vars, log ):
     SYSIMG_PATH             the path where the system image will be mounted
     (always starts with TEMP_PATH)
     NODE_ID                  The db node_id for this machine
+    PLCONF_DIR               The directory to store the configuration file in
     
     Sets the following variables:
     None
@@ -70,6 +72,10 @@ def Run( vars, log ):
         NODE_ID= vars["NODE_ID"]
         if NODE_ID == "":
             raise ValueError, "NODE_ID"
+
+        PLCONF_DIR= vars["PLCONF_DIR"]
+        if PLCONF_DIR == "":
+            raise ValueError, "PLCONF_DIR"
         
     except KeyError, var:
         raise BootManagerException, "Missing variable in vars: %s\n" % var
@@ -99,8 +105,9 @@ def Run( vars, log ):
                 
     services= [ "netfs", "rawdevices", "cpuspeed", "smartd" ]
     for service in services:
-        log.write( "Disabling unneeded service: %s\n" % service )
-        utils.sysexec( "chroot %s chkconfig --level 12345 %s off" %
-                       (SYSIMG_PATH,service), log )
+        if os.path.exists("%s/etc/init.d/%s" % (SYSIMG_PATH,service)):
+            log.write( "Disabling unneeded service: %s\n" % service )
+            utils.sysexec( "chroot %s chkconfig --level 12345 %s off" %
+                           (SYSIMG_PATH,service), log )
             
     return 1