git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svn merge -c 9766 https://svn.planet-lab.org/svn/BootManager/branches/3.2 into trunk
[bootmanager.git]
/
source
/
steps
/
InstallInit.py
diff --git
a/source/steps/InstallInit.py
b/source/steps/InstallInit.py
index
828045f
..
c609818
100644
(file)
--- a/
source/steps/InstallInit.py
+++ b/
source/steps/InstallInit.py
@@
-60,7
+60,7
@@
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)
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
except OSError, e:
pass
@@
-70,8
+70,8
@@
def Run( vars, log ):
utils.sysexec_noerr( "umount %s" % SYSIMG_PATH )
vars['ROOT_MOUNTED']= 0
utils.sysexec_noerr( "umount %s" % SYSIMG_PATH )
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:
log.write( "Cleaning up any existing PlanetLab config files\n" )
try: