Merge from Head

diff --git a/bootmanager.spec b/bootmanager.spec
index b76ab5a..c379950 100644 (file)
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -1,10 +1,10 @@
 %define name bootmanager
 %define version 3.1.15
-%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
+Distribution: PlanetLab 4.1
 URL: http://cvs.planet-lab.org/cvs/bootmanager
 
 Summary: The PlanetLab Boot Manager
@@ -32,7 +32,9 @@ nodes.
 pushd bootmanager
 
 ./build.sh
-make -C support-files
+pushd support-files
+./buildnode.sh -r $([ -f "/etc/fedora-release" ] && awk ' { print $4 } ' /etc/fedora-release || echo "4")
+popd
 
 popd
 

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index f2c2061..e3c64d6 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -119,13 +119,16 @@ 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" \
-          % 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 )
 
     log.write( "Updating ssh public host key with PLC.\n" )