X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FValidateNodeInstall.py;h=ad853b68f69f0276e403a3755f4a3f0ae9a9fc26;hb=d47844280d96fd48566dc59716fe09238311f62a;hp=0d1d16561473a6e5a334e1feda721e6167f92b04;hpb=30cbd3c60178e01643ec5100a068ed82c8f38013;p=bootmanager.git

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index 0d1d165..ad853b6 100644
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -93,18 +93,22 @@ def Run( vars, log ):
         except BootManagerException, e:
             log.write( "BootManagerException during fsck of /root and /vservers : %s\n" %
                        str(e) )
+            return 0
 
         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)
-
+            
+            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/vservers" % \
-                          (PARTITIONS["vservers"], SYSIMG_PATH), log)
+            utils.sysexec("mount -t ext3 %s %s" % (PARTITIONS["vservers"], VSERVERS_PATH), log)
 
+            PROC_PATH = "%s/proc" % SYSIMG_PATH
+            utils.makedirs(PROC_PATH)
             log.write( "mounting /proc\n" )
-            utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log )
+            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) )