X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FValidateNodeInstall.py;h=845348a17fc73bbc7f26c873f974ac1e206425f3;hb=21ad5ef5cec09027e46212ef52f9cf4aaeab675d;hp=7b7ed8a94ad2e277913cf7c689828238326f5223;hpb=1b7d302257dab2e29bb1dabcbd7215475bbf956e;p=bootmanager.git

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index 7b7ed8a..845348a 100644
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -1,9 +1,16 @@
+#!/usr/bin/python
+
+# Copyright (c) 2003 Intel Corporation
+# All rights reserved.
+#
+# Copyright (c) 2004-2006 The Trustees of Princeton University
+# All rights reserved.
+
 import os
 
 from Exceptions import *
 import utils
-from systeminfo import systeminfo
-import compatibility
+import systeminfo
 import ModelOptions
 
 
@@ -16,7 +23,6 @@ def Run( vars, log ):
     Expect the following variables to be set:
     SYSIMG_PATH              the path where the system image will be mounted
                              (always starts with TEMP_PATH)
-    BOOT_CD_VERSION          A tuple of the current bootcd version
     ROOT_MOUNTED             the node root file system is mounted
     NODE_ID                  The db node_id for this machine
     PLCONF_DIR               The directory to store the configuration file in
@@ -29,10 +35,6 @@ def Run( vars, log ):
 
     # make sure we have the variables we need
     try:
-        BOOT_CD_VERSION= vars["BOOT_CD_VERSION"]
-        if BOOT_CD_VERSION == "":
-            raise ValueError, "BOOT_CD_VERSION"
-
         SYSIMG_PATH= vars["SYSIMG_PATH"]
         if SYSIMG_PATH == "":
             raise ValueError, "SYSIMG_PATH"
@@ -47,6 +49,10 @@ def Run( vars, log ):
         
         NODE_MODEL_OPTIONS= vars["NODE_MODEL_OPTIONS"]
 
+        PARTITIONS= vars["PARTITIONS"]
+        if PARTITIONS == None:
+            raise ValueError, "PARTITIONS"
+
     except KeyError, var:
         raise BootManagerException, "Missing variable in vars: %s\n" % var
     except ValueError, var:
@@ -54,21 +60,18 @@ def Run( vars, log ):
 
 
     ROOT_MOUNTED= 0
-    if 'ROOT_MOUNTED' in vars.keys():
+    if vars.has_key('ROOT_MOUNTED'):
         ROOT_MOUNTED= vars['ROOT_MOUNTED']
 
     # mount the root system image if we haven't already.
     # capture BootManagerExceptions during the vgscan/change and mount
     # calls, so we can return 0 instead
     if ROOT_MOUNTED == 0:
-        # old cds need extra utilities to run lvm
-        if BOOT_CD_VERSION[0] == 2:
-            compatibility.setup_lvm_2x_cd( vars, log )
             
         # simply creating an instance of this class and listing the system
         # block devices will make them show up so vgscan can find the planetlab
         # volume group
-        systeminfo().get_block_device_list()
+        systeminfo.get_block_device_list(vars, log)
 
         try:
             utils.sysexec( "vgscan", log )
@@ -81,26 +84,49 @@ def Run( vars, log ):
         utils.makedirs( SYSIMG_PATH )
 
         try:
-            utils.sysexec( "mount /dev/planetlab/root %s" % SYSIMG_PATH, log )
-            utils.sysexec( "mount /dev/planetlab/vservers %s/vservers" %
-                           SYSIMG_PATH, log )
-            utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log )
+            # 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 vgscan/vgchange: %s\n" %
+            log.write( "BootManagerException during fsck of /root and /vservers : %s\n" %
                        str(e) )
-            return 0
+            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" % (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_PATH, log )
+        except BootManagerException, e:
+            log.write( "BootManagerException during mount of /root, /vservers and /proc: %s\n" %
+                       str(e) )
+            return -2
 
         ROOT_MOUNTED= 1
         vars['ROOT_MOUNTED']= 1
         
     
-    # check if the base kernel is installed
+    # 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)
     except OSError, e:            
-        log.write( "FATAL: Couldn't locate base kernel.\n")                
-        return 0
+        log.write( "Couldn't locate base kernel (you might be using the stock kernel).\n")
+        return -3
 
     # check if the model specified kernel is installed
     option = ''
@@ -130,6 +156,6 @@ def Run( vars, log ):
         log.write( "Unable to write out /etc/planetlab/node_id\n" )
         return 0
 
-    log.write( "Everything appears to be ok\n" )
+    log.write( "Node installation appears to be ok\n" )
     
     return 1