do not check for initrd in Validate, since it is recreated later.

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

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index ad74d08..c70aad9 100644 (file)
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -18,7 +18,7 @@ def Run( vars, log ):
     """
     See if a node installation is valid. More checks should certainly be
     done in the future, but for now, make sure that the sym links kernel-boot
-    and initrd-boot exist in /boot
+    exist in /boot
     
     Expect the following variables to be set:
     SYSIMG_PATH              the path where the system image will be mounted
@@ -84,19 +84,35 @@ def Run( vars, log ):
         utils.makedirs( SYSIMG_PATH )
 
         try:
+            # first run fsck to prevent fs corruption from hanging mount...
+            log.write( "fsck root file system\n" )
+            utils.sysexec("e2fsck -v -p %s" % (PARTITIONS["root"]),log)
+
+            log.write( "fsck vserver file system\n" )
+            utils.sysexec("e2fsck -v -p %s" % (PARTITIONS["vservers"]),log)
+        except BootManagerException, e:
+            log.write( "BootManagerException during fsck of /root and /vservers : %s\n" %
+                       str(e) )
+            return -1
+
+        try:
+            # then attempt to mount them
             log.write( "mounting root file system\n" )
             utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["root"],SYSIMG_PATH),log)
-
+            
+            VSERVERS_PATH = "%s/vservers" % SYSIMG_PATH
+            utils.makedirs(VSERVERS_PATH)
             log.write( "mounting vserver partition in root file system\n" )
-            utils.sysexec("mount -t ext3 %s %s/vservers" % \
-                          (PARTITIONS["vservers"], SYSIMG_PATH), log)
+            utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log)
 
+            PROC_PATH = "%s/proc" % SYSIMG_PATH
+            utils.makedirs(PROC_PATH)
             log.write( "mounting /proc\n" )
-            utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log )
+            utils.sysexec( "mount -t proc none %s" % PROC_PATH, log )
         except BootManagerException, e:
             log.write( "BootManagerException during mount of /root, /vservers and /proc: %s\n" %
                        str(e) )
-            return 0
+            return -2
 
         ROOT_MOUNTED= 1
         vars['ROOT_MOUNTED']= 1
@@ -107,10 +123,9 @@ def Run( vars, log ):
     log.write("Checking for a custom kernel\n")
     try:
         os.stat("%s/boot/kernel-boot" % SYSIMG_PATH)
-        os.stat("%s/boot/initrd-boot" % SYSIMG_PATH)
     except OSError, e:            
         log.write( "Couldn't locate base kernel (you might be using the stock kernel).\n")
-        return 0
+        return -3
 
     # check if the model specified kernel is installed
     option = ''
@@ -118,7 +133,6 @@ def Run( vars, log ):
         option = 'smp'
         try:
             os.stat("%s/boot/kernel-boot%s" % (SYSIMG_PATH,option))
-            os.stat("%s/boot/initrd-boot%s" % (SYSIMG_PATH,option))
         except OSError, e:
             # smp kernel is not there; remove option from modeloptions
             # such that the rest of the code base thinks we are just