if NODE_MODEL_OPTIONS & ModelOptions.RAWDISK:
VSERVERS_SIZE= "-1"
- if "VSERVER_SIZE" in vars:
+ if "VSERVERS_SIZE" in vars:
VSERVERS_SIZE= vars["VSERVERS_SIZE"]
if VSERVERS_SIZE == "" or VSERVERS_SIZE == 0:
raise ValueError, "VSERVERS_SIZE"
utils.sysexec_noerr( "lvremove -f %s" % PARTITIONS["swap"], log )
utils.sysexec_noerr( "lvremove -f %s" % PARTITIONS["vservers"], log )
utils.sysexec_noerr( "vgchange -an", log )
- utils.sysexec_noerr( "vgremove planetlab", log )
+ utils.sysexec_noerr( "vgremove -f planetlab", log )
log.write( "Running vgscan for devices\n" )
utils.sysexec_noerr( "vgscan", log )
#utils.sysexec( TEMP_PATH + "vgchange -ay planetlab", log )
# make swap
- utils.sysexec( "mkswap %s" % PARTITIONS["swap"], log )
+ utils.sysexec( "mkswap -f %s" % PARTITIONS["swap"], log )
# check if badhd option has been set
option = ''
log.write("formatting %s partition (%s)%s.\n" % (fs,devname,txt))
utils.sysexec( "mkfs.ext2 -q %s -m %d -j %s" % (option,rbp,devname), log )
+ # disable time/count based filesystems checks
+ for filesystem in ("root","vservers"):
+ utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % PARTITIONS[filesystem], log)
+
# save the list of block devices in the log
log.write( "Block devices used (in lvm): %s\n" % repr(used_devices))
"""
# two forms, depending on which version of pyparted we have
+ # v1 does not have a 'version' method
+ # v2 and above does, but to make it worse,
+ # parted-3.4 on f14 has parted.version broken and raises SystemError
try:
- version=parted.version()
+ parted.version()
return single_partition_device_2_x (device, vars, log)
- except:
+ except AttributeError:
+ # old parted does not have version at all
return single_partition_device_1_x (device, vars, log)
-
-
+ except SystemError:
+ # let's assume this is >=2
+ return single_partition_device_2_x (device, vars, log)
+ except:
+ raise
def single_partition_device_1_x ( device, vars, log):
lvm_flag= parted.partition_flag_get_by_name('lvm')
try:
- print >>log, "Using pyparted 1.x"
+ log.write("Using pyparted 1.x\n")
# wipe the old partition table
utils.sysexec( "dd if=/dev/zero of=%s bs=512 count=1" % device, log )
def single_partition_device_2_x ( device, vars, log):
try:
- print >>log, "Using pyparted 2.x"
+ log.write("Using pyparted 2.x\n")
# wipe the old partition table
utils.sysexec( "dd if=/dev/zero of=%s bs=512 count=1" % device, log )
# get the device