From: Marc Fiuczynski Date: Fri, 11 Sep 2009 17:07:08 +0000 (+0000) Subject: - switch to using ext2 vs. ext3. X-Git-Tag: BootManager-4.3-14~7 X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=baf838cd5db93ecadd012d0e065ffbc8f3bcf113 - switch to using ext2 vs. ext3. --- diff --git a/source/steps/CheckForNewDisks.py b/source/steps/CheckForNewDisks.py index d53351c..80ca737 100644 --- a/source/steps/CheckForNewDisks.py +++ b/source/steps/CheckForNewDisks.py @@ -169,7 +169,7 @@ def Run( vars, log ): res = 1 break - log.write( "making the ext3 filesystem match new logical volume size.\n" ) + log.write( "making the ext filesystem match new logical volume size.\n" ) vars['ROOT_MOUNTED']= 1 cmd = "mount %s %s" % (PARTITIONS["root"],SYSIMG_PATH) diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index 2c49acc..2124f72 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -82,11 +82,11 @@ def Run( vars, log ): utils.makedirs( SYSIMG_PATH ) log.write( "mounting root file system\n" ) - utils.sysexec( "mount -t ext3 %s %s" % (PARTITIONS["root"],SYSIMG_PATH), log ) + utils.sysexec( "mount -t ext2 %s %s" % (PARTITIONS["root"],SYSIMG_PATH), log ) log.write( "mounting vserver partition in root file system\n" ) utils.makedirs( SYSIMG_PATH + "/vservers" ) - utils.sysexec( "mount -t ext3 %s %s/vservers" % (PARTITIONS["vservers"], + utils.sysexec( "mount -t ext2 %s %s/vservers" % (PARTITIONS["vservers"], SYSIMG_PATH), log ) vars['ROOT_MOUNTED']= 1 diff --git a/source/steps/InstallWriteConfig.py b/source/steps/InstallWriteConfig.py index 29b4e4c..40d3cbe 100644 --- a/source/steps/InstallWriteConfig.py +++ b/source/steps/InstallWriteConfig.py @@ -84,15 +84,13 @@ def Run( vars, log ): fstab= file( "%s/etc/fstab" % SYSIMG_PATH, "w" ) fstab.write( "%s none swap sw 0 0\n" % \ PARTITIONS["mapper-swap"] ) - fstab.write( "%s / ext3 defaults 1 1\n" % \ + fstab.write( "%s / ext2 defaults 1 1\n" % \ PARTITIONS["mapper-root"] ) - fstab.write( "%s /vservers ext3 tagxid,defaults 1 2\n" % \ + fstab.write( "%s /vservers ext2 tagxid,defaults 1 2\n" % \ PARTITIONS["mapper-vservers"] ) fstab.write( "none /proc proc defaults 0 0\n" ) fstab.write( "none /dev/shm tmpfs defaults 0 0\n" ) fstab.write( "none /dev/pts devpts defaults 0 0\n" ) - # no longer needed - # fstab.write( "none /rcfs rcfs defaults 0 0\n" ) fstab.close() log.write( "Writing system /etc/issue\n" ) diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py index c70aad9..85dcf5e 100644 --- a/source/steps/ValidateNodeInstall.py +++ b/source/steps/ValidateNodeInstall.py @@ -83,41 +83,45 @@ def Run( vars, log ): utils.makedirs( SYSIMG_PATH ) - try: - # first run fsck to prevent fs corruption from hanging mount... - log.write( "fsck root file system\n" ) - utils.sysexec("e2fsck -v -p %s" % (PARTITIONS["root"]),log) - - log.write( "fsck vserver file system\n" ) - utils.sysexec("e2fsck -v -p %s" % (PARTITIONS["vservers"]),log) - except BootManagerException, e: - log.write( "BootManagerException during fsck of /root and /vservers : %s\n" % - str(e) ) - return -1 + for filesystem in ("root","vservers"): + try: + # first run fsck to prevent fs corruption from hanging mount... + log.write( "fsck %s file system\n" % filesystem ) + utils.sysexec("e2fsck -v -p %s" % (PARTITIONS[filesystem]),log) + except BootManagerException, e: + log.write( "BootManagerException during fsck of %s (%s) filesystem : %s\n" % + (filesystem, PARTITIONS[filesystem], str(e)) ) + return -1 try: # then attempt to mount them log.write( "mounting root file system\n" ) - utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["root"],SYSIMG_PATH),log) + utils.sysexec("mount -t ext2 %s %s" % (PARTITIONS["root"],SYSIMG_PATH),log) + except BootManagerException, e: + log.write( "BootManagerException during mount of /root: %s\n" % str(e) ) + return -2 - VSERVERS_PATH = "%s/vservers" % SYSIMG_PATH - utils.makedirs(VSERVERS_PATH) - log.write( "mounting vserver partition in root file system\n" ) - utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log) - + try: PROC_PATH = "%s/proc" % SYSIMG_PATH utils.makedirs(PROC_PATH) log.write( "mounting /proc\n" ) utils.sysexec( "mount -t proc none %s" % PROC_PATH, log ) except BootManagerException, e: - log.write( "BootManagerException during mount of /root, /vservers and /proc: %s\n" % - str(e) ) + log.write( "BootManagerException during mount of /proc: %s\n" % str(e) ) + return -2 + + try: + VSERVERS_PATH = "%s/vservers" % SYSIMG_PATH + utils.makedirs(VSERVERS_PATH) + log.write( "mounting vserver partition in root file system\n" ) + utils.sysexec("mount -t ext2 %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log) + except BootManagerException, e: + log.write( "BootManagerException during mount of /vservers: %s\n" % str(e) ) return -2 ROOT_MOUNTED= 1 vars['ROOT_MOUNTED']= 1 - # check if the base kernel is installed # these 2 links are created by our kernel's post-install scriplet log.write("Checking for a custom kernel\n")