- utils.sysexec( "mount /dev/planetlab/root %s" % SYSIMG_PATH, log )
- utils.sysexec( "mount /dev/planetlab/vservers %s/vservers" %
- SYSIMG_PATH, log )
- utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log )
- except BootManagerException, e:
- log.write( "BootManagerException during vgscan/vgchange: %s\n" %
- str(e) )
- return 0
-
- ROOT_MOUNTED= 1
- vars['ROOT_MOUNTED']= 1
+ # then attempt to mount them
+ log.write("mounting root file system\n")
+ utils.sysexec("mount -t ext3 {} {}".format(PARTITIONS["root"], SYSIMG_PATH),log)
+ except BootManagerException as e:
+ log.write("BootManagerException during mount of /root: {}\n".format(str(e)))
+ return -2
+
+ try:
+ PROC_PATH = "{}/proc".format(SYSIMG_PATH)
+ utils.makedirs(PROC_PATH)
+ log.write("mounting /proc\n")
+ utils.sysexec("mount -t proc none {}".format(PROC_PATH), log)
+ except BootManagerException as e:
+ log.write("BootManagerException during mount of /proc: {}\n".format(str(e)))
+ return -2
+
+
+ one_partition = vars['ONE_PARTITION']=='1'
+
+ if (not one_partition):
+ try:
+ VSERVERS_PATH = "{}/vservers".format(SYSIMG_PATH)
+ utils.makedirs(VSERVERS_PATH)
+ log.write("mounting vservers partition in root file system\n")
+ if vars['virt'] == 'vs':
+ utils.sysexec("mount -t ext3 {} {}".format(PARTITIONS["vservers"], VSERVERS_PATH), log)
+ else:
+ utils.sysexec("mount -t btrfs {} {}".format(PARTITIONS["vservers"], VSERVERS_PATH), log)
+ except BootManagerException as e:
+ log.write("BootManagerException while mounting /vservers: {}\n".format(str(e)))
+ return -2
+
+ ROOT_MOUNTED = 1
+ vars['ROOT_MOUNTED'] = 1