X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=16dd38dff237eb10693865caed9a28d8f0d5645c;hb=8d38695b0ebd02dac24b291cabd9555f71d4cd79;hp=d241268d8e70d421b7f54600260640ce69e85be5;hpb=51f58f3b0fb0da0f169ea14ef64e9a91ff45d1dd;p=bootmanager.git

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index d241268..16dd38d 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
@@ -11,10 +11,9 @@ import string
 import re
 import os
 
-import UpdateBootStateWithPLC
+import UpdateNodeConfiguration
 from Exceptions import *
 import utils
-import compatibility
 import systeminfo
 import BootAPI
 import notify_messages
@@ -30,7 +29,6 @@ def Run( vars, log ):
     booting has occurred.
     
     Expect the following variables:
-    BOOT_CD_VERSION       A tuple of the current bootcd version
     SYSIMG_PATH           the path where the system image will be mounted
                           (always starts with TEMP_PATH)
     ROOT_MOUNTED          the node root file system is mounted
@@ -46,10 +44,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"
@@ -73,16 +67,12 @@ def Run( vars, log ):
         raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var
 
     ROOT_MOUNTED= 0
-    if 'ROOT_MOUNTED' in vars.keys():
+    if vars.has_key('ROOT_MOUNTED'):
         ROOT_MOUNTED= vars['ROOT_MOUNTED']
     
     if ROOT_MOUNTED == 0:
         log.write( "Mounting node partitions\n" )
 
-        # 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
@@ -95,10 +85,10 @@ def Run( vars, log ):
 
         cmd = "mount %s %s" % (PARTITIONS["root"],SYSIMG_PATH)
         utils.sysexec( cmd, log )
-        cmd = "mount %s %s/vservers" % (PARTITIONS["vservers"],SYSIMG_PATH)
-        utils.sysexec( cmd, log )
         cmd = "mount -t proc none %s/proc" % SYSIMG_PATH
         utils.sysexec( cmd, log )
+        cmd = "mount %s %s/vservers" % (PARTITIONS["vservers"],SYSIMG_PATH)
+        utils.sysexec( cmd, log )
 
         ROOT_MOUNTED= 1
         vars['ROOT_MOUNTED']= 1
@@ -119,18 +109,21 @@ def Run( vars, log ):
     log.write( "Updating configuration files.\n" )
     try:
         cmd = "/etc/init.d/conf_files start --noscripts"
-        utils.sysexec( "chroot %s %s" % (SYSIMG_PATH, cmd), log )
+        utils.sysexec_chroot( SYSIMG_PATH, cmd, log )
     except IOError, e:
         log.write("conf_files failed with \n %s" % e)
 
     # update node packages
     log.write( "Running node update.\n" )
     if os.path.exists( SYSIMG_PATH + "/usr/bin/NodeUpdate.py" ):
-        cmd = "chroot %s /usr/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH
+        cmd = "/usr/bin/NodeUpdate.py start noreboot"
     else:
         # for backwards compatibility
-        cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH
-    utils.sysexec( cmd, log )
+        cmd = "/usr/local/planetlab/bin/NodeUpdate.py start noreboot"
+    utils.sysexec_chroot( SYSIMG_PATH, cmd, log )
+
+    # the following step should be done by NM
+    UpdateNodeConfiguration.Run( vars, log )
 
     log.write( "Updating ssh public host key with PLC.\n" )
     ssh_host_key= ""
@@ -158,17 +151,10 @@ def Run( vars, log ):
     BootAPI.save(vars)
 
     log.write( "Unmounting disks.\n" )
-    try:
-        # backwards compat, though, we should never hit this case post PL 3.2
-        os.stat("%s/rcfs/taskclass"%SYSIMG_PATH)
-        utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, log )
-    except OSError, e:
-        pass
-
-    utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH, log )
-    utils.sysexec_noerr( "umount -r %s/vservers" % SYSIMG_PATH, log )
-    utils.sysexec_noerr( "umount -r %s" % SYSIMG_PATH, log )
-    utils.sysexec_noerr( "vgchange -an", log )
+    utils.sysexec( "umount %s/vservers" % SYSIMG_PATH, log )
+    utils.sysexec( "umount %s/proc" % SYSIMG_PATH, log )
+    utils.sysexec( "umount %s" % SYSIMG_PATH, log )
+    utils.sysexec( "vgchange -an", log )
 
     ROOT_MOUNTED= 0
     vars['ROOT_MOUNTED']= 0
@@ -190,17 +176,14 @@ def Run( vars, log ):
     
     utils.sysexec_noerr( "ifconfig eth0 down", log )
 
-    if BOOT_CD_VERSION[0] == 2:
-        utils.sysexec_noerr( "killall dhcpcd", log )
-    elif BOOT_CD_VERSION[0] >= 3:
-        utils.sysexec_noerr( "killall dhclient", log )
+    utils.sysexec_noerr( "killall dhclient", log )
         
     utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log )
     utils.sysexec_noerr( "modprobe -r lvm-mod", log )
     
     # modules that should not get unloaded
     # unloading cpqphp causes a kernel panic
-    blacklist = [ "floppy", "cpqphp" ]
+    blacklist = [ "floppy", "cpqphp", "i82875p_edac", "mptspi"]
     try:
         modules= file("/tmp/loadedmodules","r")
         
@@ -211,7 +194,7 @@ def Run( vars, log ):
             elif module != "":
                 log.write( "Unloading %s\n" % module )
                 utils.sysexec_noerr( "modprobe -r %s" % module, log )
-                if module == "e1000":
+                if "e1000" in module:
                     log.write("Unloading e1000 driver; sleeping 4 seconds...\n")
                     time.sleep(4)
 
@@ -275,6 +258,7 @@ def Run( vars, log ):
         # kargs, which is ramdisk_size=8192
         pass 
 
+    utils.sysexec_noerr( 'hwclock --systohc --utc ' )
     utils.breakpoint ("Before kexec");
     try:
         utils.sysexec( 'kexec --force --initrd=/tmp/initrd ' \