From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Sat, 10 Jan 2009 01:15:40 +0000 (+0000)
Subject: merged from branch. run fsck before mounts.
X-Git-Tag: BootManager-4.3-2~5
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=30cbd3c60178e01643ec5100a068ed82c8f38013

merged from branch. run fsck before mounts.
---

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index ad74d08..0d1d165 100644
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -84,6 +84,18 @@ 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) )
+
+        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)