X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=6d1e39ea15ca2cd99a3ad995ac68f30cf79c5559;hb=e56dca286266de0ffda334ad80d89db198641624;hp=b04756d6cae247521d9aab1d47f6b0080ff1fbb5;hpb=14b9df8e45d4877d3cd171d7d7fa2fd235dcc935;p=bootmanager.git

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index b04756d..6d1e39e 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.
@@ -12,12 +12,13 @@ import re
 import os
 
 import UpdateBootStateWithPLC
+import UpdateNodeConfiguration
 from Exceptions import *
 import utils
-import compatibility
 import systeminfo
 import BootAPI
 import notify_messages
+import time
 
 import ModelOptions
 
@@ -29,7 +30,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
@@ -45,10 +45,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"
@@ -72,16 +68,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
@@ -116,18 +108,24 @@ def Run( vars, log ):
 
     # update configuration files
     log.write( "Updating configuration files.\n" )
-    if os.path.exists( SYSIMG_PATH + "/etc/init.d/conf_files" ):
+    try:
         cmd = "/etc/init.d/conf_files start --noscripts"
-    else:
-        cmd = "/usr/bin/PlanetLabConf.py noscripts"
-    utils.sysexec( "chroot %s %s" % (SYSIMG_PATH, cmd), log )
+        utils.sysexec( "chroot %s %s" % (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" )
-    cmd = "chroot %s /usr/bin/NodeUpdate.py start noreboot" \
-          % SYSIMG_PATH
+    if os.path.exists( SYSIMG_PATH + "/usr/bin/NodeUpdate.py" ):
+        cmd = "chroot %s /usr/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH
+    else:
+        # for backwards compatibility
+        cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH
     utils.sysexec( 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= ""
     try:
@@ -151,6 +149,8 @@ def Run( vars, log ):
     utils.sysexec( "cp %s/boot/kernel-boot%s /tmp/kernel" % (SYSIMG_PATH,option), log )
     utils.sysexec( "cp %s/boot/initrd-boot%s /tmp/initrd" % (SYSIMG_PATH,option), log )
 
+    BootAPI.save(vars)
+
     log.write( "Unmounting disks.\n" )
     try:
         # backwards compat, though, we should never hit this case post PL 3.2
@@ -184,22 +184,27 @@ 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", "i82875p_edac", "mptspi"]
     try:
         modules= file("/tmp/loadedmodules","r")
         
         for line in modules:
             module= string.strip(line)
-            if module != "":
+            if module in blacklist :
+                log.write("Skipping unload of kernel module '%s'.\n"%module)
+            elif module != "":
                 log.write( "Unloading %s\n" % module )
                 utils.sysexec_noerr( "modprobe -r %s" % module, log )
+                if "e1000" in module:
+                    log.write("Unloading e1000 driver; sleeping 4 seconds...\n")
+                    time.sleep(4)
 
         modules.close()
     except IOError:
@@ -234,7 +239,7 @@ def Run( vars, log ):
                 # problems during chain boot, such as USB host
                 # controller drivers (HCDs) (PL6577).
                 # if int(parts[2]) == 0:
-                if re.search('_hcd$', parts[0]):
+                if False and re.search('_hcd$', parts[0]):
                     if usb_usage > 0:
                         log.write( "NOT unloading %s since USB may be in use\n" % parts[0] )
                     else:
@@ -261,6 +266,8 @@ 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 ' \
                        '--append="%s" /tmp/kernel' % kargs)