From debbc8e212b3759501e3dcbca7f2c8a39ef40286 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 11 Sep 2009 17:05:40 +0000 Subject: [PATCH] - mount /vserver after /proc - remove backwards compat support for CKRM enabled kernels - use sysexec and not sysexec_noerr for umount/vgchange operations --- source/steps/ChainBootNode.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index e92ad58..16dd38d 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -85,10 +85,10 @@ def Run( vars, log ): cmd = "mount %s %s" % (PARTITIONS["root"],SYSIMG_PATH) utils.sysexec( cmd, log ) - cmd = "mount %s %s/vservers" % (PARTITIONS["vservers"],SYSIMG_PATH) - utils.sysexec( cmd, log ) cmd = "mount -t proc none %s/proc" % SYSIMG_PATH utils.sysexec( cmd, log ) + cmd = "mount %s %s/vservers" % (PARTITIONS["vservers"],SYSIMG_PATH) + utils.sysexec( cmd, log ) ROOT_MOUNTED= 1 vars['ROOT_MOUNTED']= 1 @@ -151,17 +151,10 @@ def Run( vars, log ): BootAPI.save(vars) log.write( "Unmounting disks.\n" ) - try: - # backwards compat, though, we should never hit this case post PL 3.2 - os.stat("%s/rcfs/taskclass"%SYSIMG_PATH) - utils.sysexec_chroot_noerr( SYSIMG_PATH, "umount /rcfs", log ) - except OSError, e: - pass - - utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount -r %s/vservers" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount -r %s" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "vgchange -an", log ) + utils.sysexec( "umount %s/vservers" % SYSIMG_PATH, log ) + utils.sysexec( "umount %s/proc" % SYSIMG_PATH, log ) + utils.sysexec( "umount %s" % SYSIMG_PATH, log ) + utils.sysexec( "vgchange -an", log ) ROOT_MOUNTED= 0 vars['ROOT_MOUNTED']= 0 -- 2.43.0