deprecate alpina-BootstrapRPM and the InstallBase step; instead just unpack PlanetLab...

diff --git a/source/BootManager.py b/source/BootManager.py
index fdda2a3..6d9d394 100755 (executable)
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -305,7 +305,6 @@ class BootManager:
         InstallInit.Run( self.VARS, self.LOG )                    
         InstallPartitionDisks.Run( self.VARS, self.LOG )            
         InstallBootstrapRPM.Run( self.VARS, self.LOG )            
         InstallInit.Run( self.VARS, self.LOG )                    
         InstallPartitionDisks.Run( self.VARS, self.LOG )            
         InstallBootstrapRPM.Run( self.VARS, self.LOG )            

-        InstallBase.Run( self.VARS, self.LOG )            

         InstallWriteConfig.Run( self.VARS, self.LOG )
         InstallBuildVServer.Run( self.VARS, self.LOG )
         InstallNodeInit.Run( self.VARS, self.LOG )
         InstallWriteConfig.Run( self.VARS, self.LOG )
         InstallBuildVServer.Run( self.VARS, self.LOG )
         InstallNodeInit.Run( self.VARS, self.LOG )

diff --git a/source/steps/InstallBootstrapRPM.py b/source/steps/InstallBootstrapRPM.py
index 86d935d..e30ae8f 100644 (file)
--- a/source/steps/InstallBootstrapRPM.py
+++ b/source/steps/InstallBootstrapRPM.py
@@ -126,7 +126,7 @@ def Run( vars, log ):
     # download and extract support tarball for
     # this step, which has everything
     # we need to successfully run
     # download and extract support tarball for
     # this step, which has everything
     # we need to successfully run

-    step_support_file= "alpina-BootstrapRPM.tar.bz2"
+    step_support_file= "PlanetLab-Bootstrap.tar.bz2"

     source_file= "%s/%s" % (SUPPORT_FILE_DIR,step_support_file)
     dest_file= "%s/%s" % (SYSIMG_PATH, step_support_file)
 
     source_file= "%s/%s" % (SUPPORT_FILE_DIR,step_support_file)
     dest_file= "%s/%s" % (SYSIMG_PATH, step_support_file)