X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FValidateNodeInstall.py;h=ad74d089799795d6ee40c0ef95ffd37bfd5af700;hb=fecd90d602104e522e4247e24a74954e5563e1cd;hp=e16e73665c22c7da47961ba115adbd17f0929c74;hpb=058804ef1dd26ffb3f230b9a93f1e170e6e87291;p=bootmanager.git

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index e16e736..ad74d08 100644
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -11,7 +11,6 @@ import os
 from Exceptions import *
 import utils
 import systeminfo
-import compatibility
 import ModelOptions
 
 
@@ -24,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
@@ -37,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"
@@ -66,16 +60,13 @@ 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
@@ -111,12 +102,14 @@ def Run( vars, log ):
         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")                
+        log.write( "Couldn't locate base kernel (you might be using the stock kernel).\n")
         return 0
 
     # check if the model specified kernel is installed
@@ -147,6 +140,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