X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=d8030e68fc7caef67d6f7c67e548cbd4d55f3fd9;hb=fc0046387e3d654a23097f50eb735e00ffda41a1;hp=01567ed25249cc5f36f91d437c031b73bdfae380;hpb=2877a4c16e34c9130bd06627f7d44c6c41ce1df7;p=bootmanager.git

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 01567ed..d8030e6 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -110,20 +110,22 @@ def Run( vars, log ):
     # update configuration files
     log.write( "Updating configuration files.\n" )
     # avoid using conf_files initscript as we're moving to systemd on some platforms
-    try:
-        cmd = "/usr/bin/env python /usr/share/NodeManager/conf_files.py --noscripts"
-        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 = "/usr/bin/NodeUpdate.py start noreboot"
-    else:
-        # for backwards compatibility
-        cmd = "/usr/local/planetlab/bin/NodeUpdate.py start noreboot"
-    utils.sysexec_chroot( SYSIMG_PATH, cmd, log )
+    if (vars['ONE_PARTITION']!='1'):
+        try:
+            cmd = "/usr/bin/env python /usr/share/NodeManager/conf_files.py --noscripts"
+            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 = "/usr/bin/NodeUpdate.py start noreboot"
+        else:
+            # for backwards compatibility
+            cmd = "/usr/local/planetlab/bin/NodeUpdate.py start noreboot"
+        utils.sysexec_chroot( SYSIMG_PATH, cmd, log )
 
     # Re-generate initrd right before kexec call
     # this is not required anymore on recent depls.
@@ -164,7 +166,7 @@ def Run( vars, log ):
             major_version = int(kversion[0]) # Check if the string looks like a kernel version
         except:
             # Try a different method for non-rpm-based distributions
-            kversion = os.popen("ls -lrt /lib/modules | tail -1 | awk '{print $9;}'").read().rstrip()
+            kversion = os.popen("ls -lrt %s/lib/modules | tail -1 | awk '{print $9;}'"%SYSIMG_PATH).read().rstrip()
 
         utils.sysexec( "cp %s/boot/vmlinuz-%s /tmp/kernel" % (SYSIMG_PATH,kversion), log )
         candidates=[]
@@ -172,6 +174,8 @@ def Run( vars, log ):
         candidates.append ("/boot/initramfs-%s.img"%(kversion))
         # f20: uses a uid of some kind, e.g. /boot/543f88c129de443baaa65800cf3927ce/<kversion>/initrd
         candidates.append ("/boot/*/%s/initrd"%(kversion))
+        # Ubuntu:
+        candidates.append ("/boot/initrd.img-%s"%(kversion))
         def find_file_in_sysimg (candidates):
             import glob
             for pattern in candidates: