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
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" )
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")