only cosmetic

[bootmanager.git] / source / steps / InstallInit.py

diff --git a/source/steps/InstallInit.py b/source/steps/InstallInit.py
index 2e6b66b..db21464 100644 (file)
--- a/source/steps/InstallInit.py
+++ b/source/steps/InstallInit.py
@@ -1,5 +1,5 @@
-#!/usr/bin/python2
-
+#!/usr/bin/python
+#
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
 #
@@ -16,7 +16,7 @@ def Run( vars, log ):
     """
     Setup the install environment:
     - unmount anything in the temp/sysimg path (possible from previous
-      aborted installs
+      aborted installs)
     - create temp directories
     
     Expect the following variables from the store:
@@ -60,18 +60,22 @@ def Run( vars, log ):
     try:
         # backwards compat, though, we should never hit this case post PL 3.2
         os.stat("%s/rcfs/taskclass"%SYSIMG_PATH)
-        utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, log )
+        utils.sysexec_chroot_noerr( SYSIMG_PATH, "umount /rcfs", log )
     except OSError, e:
         pass
 
-    utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH )
-    utils.sysexec_noerr( "umount %s/mnt/cdrom" % SYSIMG_PATH )
-    utils.sysexec_noerr( "umount %s/vservers" % SYSIMG_PATH )
-    utils.sysexec_noerr( "umount %s" % SYSIMG_PATH )
+    # NOTE: added /sys and /dev b/c some nodes fail due to this when disk is
+    # nearly full.
+    utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH , log )
+    utils.sysexec_noerr( "umount %s/mnt/cdrom" % SYSIMG_PATH , log )
+    utils.sysexec_noerr( "umount %s/vservers" % SYSIMG_PATH , log )
+    utils.sysexec_noerr( "umount %s/sys" % SYSIMG_PATH , log )
+    utils.sysexec_noerr( "umount %s/dev" % SYSIMG_PATH , log )
+    utils.sysexec_noerr( "umount %s" % SYSIMG_PATH , log )
     vars['ROOT_MOUNTED']= 0
 
-    log.write( "Removing any old files, directories\n" )
-    utils.removedir( TEMP_PATH )
+#    log.write( "Removing any old files, directories\n" )
+#    utils.removedir( TEMP_PATH )
     
     log.write( "Cleaning up any existing PlanetLab config files\n" )
     try: