From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Wed, 22 Aug 2007 15:43:47 +0000 (+0000)
Subject: Changed NodeUpdate's path.  Nothing should exist in /usr/local.
X-Git-Tag: bootmanager-3.2-2~37
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b784af8b7696d21f8e56a136a4040ce4538ea272;p=bootmanager.git

Changed NodeUpdate's path.  Nothing should exist in /usr/local.
---

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index b04756d..e3c64d6 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -124,8 +124,11 @@ def Run( vars, log ):
 
     # 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 )
 
     log.write( "Updating ssh public host key with PLC.\n" )