From 375b5b117f6b72f7bb0179dd5771e386a0c6d47a Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 11 Feb 2010 23:18:25 +0000 Subject: [PATCH] solve the ordering problem which causes the boot failure --- source/BootManager.py | 1 - source/steps/ChainBootNode.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/BootManager.py b/source/BootManager.py index 96abf90..e5a448e 100755 --- a/source/BootManager.py +++ b/source/BootManager.py @@ -227,7 +227,6 @@ class BootManager: ret = ValidateNodeInstall.Run( self.VARS, self.LOG ) if ret == 1: WriteModprobeConfig.Run( self.VARS, self.LOG ) - MakeInitrd.Run( self.VARS, self.LOG ) WriteNetworkConfig.Run( self.VARS, self.LOG ) CheckForNewDisks.Run( self.VARS, self.LOG ) SendHardwareConfigToPLC.Run( self.VARS, self.LOG ) diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index 37a8d67..6e11cfd 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -15,6 +15,7 @@ import re import os import UpdateNodeConfiguration +import MakeInitrd from Exceptions import * import utils import systeminfo @@ -125,6 +126,9 @@ def Run( vars, log ): cmd = "/usr/local/planetlab/bin/NodeUpdate.py start noreboot" utils.sysexec_chroot( SYSIMG_PATH, cmd, log ) + # Re-generate initrd right before kexec call + MakeInitrd.Run( vars, log ) + # the following step should be done by NM UpdateNodeConfiguration.Run( vars, log ) -- 2.47.0