X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FValidateNodeInstall.py;h=4ae1ff8f5a0e456431c4964aff97f387a95095b1;hb=f4ad0a5814e8b62eda1f80d6e1266bd11d84015b;hp=ad853b68f69f0276e403a3755f4a3f0ae9a9fc26;hpb=d47844280d96fd48566dc59716fe09238311f62a;p=bootmanager.git

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index ad853b6..4ae1ff8 100644
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-
+#
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
 #
@@ -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
@@ -83,50 +83,83 @@ 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 0
+        # xxx - TODO - need to fsck the btrfs partition
+        if vars['virt'] == 'vs':
+            filesystems_tocheck = ['root', 'vservers']
+        else:
+            filesystems_tocheck = ['root']
+
+        for filesystem in filesystems_tocheck:
+            try:
+                # first run fsck to prevent fs corruption from hanging mount...
+                log.write( "fsck %s file system\n" % filesystem )
+                utils.sysexec("e2fsck -v -p %s" % (PARTITIONS[filesystem]), log, fsck=True)
+            except BootManagerException, e:
+                log.write( "BootManagerException during fsck of %s (%s) filesystem : %s\n" %
+                           (filesystem, PARTITIONS[filesystem], str(e)) )
+                try:
+                    log.write( "Trying to recover filesystem errors on %s\n" % filesystem )
+                    utils.sysexec("e2fsck -v -y %s" % (PARTITIONS[filesystem]),log, fsck=True)
+                except BootManagerException, e:
+                    log.write( "BootManagerException during trying to recover filesystem errors on %s (%s) filesystem : %s\n" %
+                           (filesystem, PARTITIONS[filesystem], str(e)) )
+                    return -1
+            else:
+                # disable time/count based filesystems checks
+                utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % PARTITIONS[filesystem], log)
 
         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)
+        except BootManagerException, e:
+            log.write( "BootManagerException during mount of /root: %s\n" % str(e) )
+            return -2
             
-            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" % (PARTITIONS["vservers"], VSERVERS_PATH), log)
-
+        try:
             PROC_PATH = "%s/proc" % SYSIMG_PATH
             utils.makedirs(PROC_PATH)
             log.write( "mounting /proc\n" )
             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
+            log.write( "BootManagerException during mount of /proc: %s\n" % str(e) )
+            return -2
+
+
+        one_partition = vars['ONE_PARTITION']=='1'
+
+        if (not one_partition):
+            try:
+                VSERVERS_PATH = "%s/vservers" % SYSIMG_PATH
+                utils.makedirs(VSERVERS_PATH)
+                log.write( "mounting vservers partition in root file system\n" )
+                if vars['virt']=='vs':
+                    utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log)
+                else:
+                    utils.sysexec("mount -t btrfs %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log)
+            except BootManagerException, e:
+                log.write( "BootManagerException during mount of /vservers: %s\n" % str(e) )
+                return -2
 
         ROOT_MOUNTED= 1
         vars['ROOT_MOUNTED']= 1
         
-    
     # check if the base kernel is installed 
     # these 2 links are created by our kernel's post-install scriplet
     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)
+        if vars['virt'] == 'vs':
+            os.stat("%s/boot/kernel-boot" % SYSIMG_PATH)
+        else:
+            try:
+                kversion = os.popen("chroot %s rpm -qa kernel | tail -1 | cut -c 8-" % SYSIMG_PATH).read().rstrip()
+                os.stat("%s/boot/vmlinuz-%s" % (SYSIMG_PATH,kversion))
+                major_version = int(kversion[0]) # Check if the string looks like a kernel version
+            except:
+                kversion = os.popen("ls -lrt %s/lib/modules | tail -1 | awk '{print $9;}'"%SYSIMG_PATH).read().rstrip()
     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 = ''
@@ -134,7 +167,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