merge initrd changes from trunk

diff --git a/source/BootManager.py b/source/BootManager.py
index cdd2cfa..c0cb6c1 100755 (executable)
--- 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 )
             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 )
                 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 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -12,6 +12,7 @@ import re
 import os
 
 import UpdateNodeConfiguration
 import os
 
 import UpdateNodeConfiguration

+import MakeInitrd

 from Exceptions import *
 import utils
 import systeminfo
 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 )
 
         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 )
 
     # the following step should be done by NM
     UpdateNodeConfiguration.Run( vars, log )