X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallPartitionDisks.py;h=48884e4e3285b46fa63a340a8cd0e5932bea1b59;hb=024a094d4d296bd2b80ab85d253a995055f88c0d;hp=f5382d1cedb3def23cdc3590c1ac2f82cfb8f085;hpb=46b7e125c111fd15cbd6942023095e6e3f861002;p=bootmanager.git

diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py
index f5382d1..48884e4 100644
--- a/source/steps/InstallPartitionDisks.py
+++ b/source/steps/InstallPartitionDisks.py
@@ -130,19 +130,22 @@ def Run( vars, log ):
     # create swap logical volume
     utils.sysexec( "lvcreate -L%s -nswap planetlab" % SWAP_SIZE, log )
 
-    # create root logical volume
-    utils.sysexec( "lvcreate -L%s -nroot planetlab" % ROOT_SIZE, log )
-
-    if vars['NODE_MODEL_OPTIONS'] & ModelOptions.RAWDISK and VSERVERS_SIZE != "-1":
-        utils.sysexec( "lvcreate -L%s -nvservers planetlab" % VSERVERS_SIZE, log )
+    # check if we want a separate partition for VMs
+    one_partition = (ROOT_SIZE == "-1")
+    if (one_partition):
         remaining_extents= get_remaining_extents_on_vg( vars, log )
-        utils.sysexec( "lvcreate -l%s -nrawdisk planetlab" % remaining_extents, log )
+        utils.sysexec( "lvcreate -l%s -nroot planetlab" % remaining_extents, log )
     else:
-        # create vservers logical volume with all remaining space
-        # first, we need to get the number of remaining extents we can use
-        remaining_extents= get_remaining_extents_on_vg( vars, log )
-        
-        utils.sysexec( "lvcreate -l%s -nvservers planetlab" % remaining_extents, log )
+        utils.sysexec( "lvcreate -L%s -nroot planetlab" % ROOT_SIZE, log )
+        if vars['NODE_MODEL_OPTIONS'] & ModelOptions.RAWDISK and VSERVERS_SIZE != "-1":
+            utils.sysexec( "lvcreate -L%s -nvservers planetlab" % VSERVERS_SIZE, log )
+            remaining_extents= get_remaining_extents_on_vg( vars, log )
+            utils.sysexec( "lvcreate -l%s -nrawdisk planetlab" % remaining_extents, log )
+        else:
+            # create vservers logical volume with all remaining space
+            # first, we need to get the number of remaining extents we can use
+            remaining_extents= get_remaining_extents_on_vg( vars, log )
+            utils.sysexec( "lvcreate -l%s -nvservers planetlab" % remaining_extents, log )
 
     # activate volume group (should already be active)
     #utils.sysexec( TEMP_PATH + "vgchange -ay planetlab", log )
@@ -181,7 +184,13 @@ def Run( vars, log ):
         utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % devname, log)
     else:
         log.write("formatting %s btrfs partition (%s).\n" % (fs,devname))
-        utils.sysexec( "mkfs.btrfs -f %s" % (devname), log )
+        # early BootCD's seem to come with a version of mkfs.btrfs that does not support -f
+        # let's check for that before invoking it
+        mkfs="mkfs.btrfs"
+        if os.system("mkfs.btrfs --help 2>&1 | grep force")==0:
+            mkfs+=" -f"
+        mkfs+=" %s"%devname
+        utils.sysexec( mkfs, log )
         # as of 2013/02 it looks like there's not yet an option to set fsck frequency with btrfs
 
     # save the list of block devices in the log