From e5b459e0ab6b35f49dfe31466296f72cc9ca9d43 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Fri, 19 Feb 2010 22:56:40 +0000 Subject: [PATCH] merge initrd changes from trunk --- 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 cdd2cfa..c0cb6c1 100755 --- a/source/BootManager.py +++ b/source/BootManager.py @@ -224,7 +224,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 16dd38d..acf3162 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -12,6 +12,7 @@ import re import os import UpdateNodeConfiguration +import MakeInitrd from Exceptions import * import utils import systeminfo @@ -122,6 +123,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.43.0