X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallUninitHardware.py;h=884c65de69a841abc653e456a6e8af7e74ba3ae4;hb=644716f1b688e140b5be6ce44342197fa3f69136;hp=e513997045fcf14d48f8d400cfa4f370a9634081;hpb=91a76ce91d7363b2907f8cda4b29071cc64de480;p=bootmanager.git diff --git a/source/steps/InstallUninitHardware.py b/source/steps/InstallUninitHardware.py index e513997..884c65d 100644 --- a/source/steps/InstallUninitHardware.py +++ b/source/steps/InstallUninitHardware.py @@ -96,15 +96,16 @@ def Run( vars, log ): except KeyError, part: raise BootManagerException, "Missing partition in PARTITIONS: %s\n" % part - # workaround - utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, 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 ) + except OSError, e: + pass log.write( "Unmounting proc.\n" ) utils.sysexec( "umount %s/proc" % SYSIMG_PATH, log ) - log.write( "Unmounting rcfs file system in image.\n" ) - utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, log ) - log.write( "Shutting down swap\n" ) utils.sysexec( "swapoff %s" % PARTITIONS["swap"], log )