From 1b1107cfc8f48d40ee260758445d3493e4428c09 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 27 Jun 2008 20:12:04 +0000
Subject: [PATCH] move the UpdateNodeConfiguration step after the NodeUpdate
step in ChainBoot
---
source/BootManager.py | 2 --
source/steps/ChainBootNode.py | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/source/BootManager.py b/source/BootManager.py
index 1d59243..2098c41 100755
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -193,8 +193,6 @@ class BootManager:
WriteModprobeConfig.Run( self.VARS, self.LOG )
MakeInitrd.Run( self.VARS, self.LOG )
WriteNetworkConfig.Run( self.VARS, self.LOG )
- # the following step should be done by NM
- UpdateNodeConfiguration.Run( self.VARS, self.LOG )
CheckForNewDisks.Run( self.VARS, self.LOG )
SendHardwareConfigToPLC.Run( self.VARS, self.LOG )
ChainBootNode.Run( self.VARS, self.LOG )
diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index d241268..10f068e 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -12,6 +12,7 @@ import re
import os
import UpdateBootStateWithPLC
+import UpdateNodeConfiguration
from Exceptions import *
import utils
import compatibility
@@ -132,6 +133,9 @@ def Run( vars, log ):
cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH
utils.sysexec( cmd, log )
+ # the following step should be done by NM
+ UpdateNodeConfiguration.Run( vars, log )
+
log.write( "Updating ssh public host key with PLC.\n" )
ssh_host_key= ""
try:
--
2.47.0