Disconnected operation.

[bootmanager.git] / source / steps / ChainBootNode.py

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index f2c2061..3e76d9c 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -119,12 +119,12 @@ def Run( vars, log ):
     if os.path.exists( SYSIMG_PATH + "/etc/init.d/conf_files" ):
         cmd = "/etc/init.d/conf_files start --noscripts"
     else:
-        cmd = "/usr/local/planetlab/bin/PlanetLabConf.py noscripts"
+        cmd = "/usr/bin/PlanetLabConf.py noscripts"
     utils.sysexec( "chroot %s %s" % (SYSIMG_PATH, cmd), log )
 
     # update node packages
     log.write( "Running node update.\n" )
-    cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" \
+    cmd = "chroot %s /usr/bin/NodeUpdate.py start noreboot" \
           % SYSIMG_PATH
     utils.sysexec( cmd, log )
 
@@ -151,6 +151,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
@@ -234,7 +236,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: