Merge branch 'master' of ssh://git.planet-lab.org/git/bootmanager

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 3b9df6d..a279c1c 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -157,6 +157,8 @@ def Run( vars, log ):
     log.write( "Unmounting disks.\n" )
     utils.sysexec( "umount %s/vservers" % SYSIMG_PATH, log )
     utils.sysexec( "umount %s/proc" % SYSIMG_PATH, log )
+    utils.sysexec_noerr( "umount %s/dev" % SYSIMG_PATH, log )
+    utils.sysexec_noerr( "umount %s/sys" % SYSIMG_PATH, log )
     utils.sysexec( "umount %s" % SYSIMG_PATH, log )
     utils.sysexec( "vgchange -an", log )
 

diff --git a/source/steps/InstallInit.py b/source/steps/InstallInit.py
index 32fbafe..3456343 100644 (file)
--- a/source/steps/InstallInit.py
+++ b/source/steps/InstallInit.py
@@ -64,9 +64,13 @@ def Run( vars, log ):
     except OSError, e:
         pass
 
+    # 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