From 04f40909223edfa75aad8d7baa45925aee7ae812 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Mon, 31 Mar 2014 23:48:13 -0400 Subject: [PATCH] Drop node manager and node update --- source/steps/ChainBootNode.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index 59d58f9..5dec739 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. -- 2.43.0