Tabulation issue

[bootmanager.git] / source / steps / InstallPartitionDisks.py

diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py
index 23b1894..65d87dd 100644 (file)
--- a/source/steps/InstallPartitionDisks.py
+++ b/source/steps/InstallPartitionDisks.py
@@ -131,7 +131,7 @@ def Run( vars, log ):
     utils.sysexec( "lvcreate -L%s -nswap planetlab" % SWAP_SIZE, log )
 
     # check if we want a separate partition for VMs
-    one_partition = (ROOT_SIZE == -1)
+    one_partition = vars['ONE_PARTITION']=='1'
     if (one_partition):
         remaining_extents= get_remaining_extents_on_vg( vars, log )
         utils.sysexec( "lvcreate -l%s -nroot planetlab" % remaining_extents, log )
@@ -182,7 +182,7 @@ def Run( vars, log ):
         utils.sysexec( "mkfs.ext2 -q %s -m %d -j %s" % (option,rbp,devname), log )
         # disable time/count based filesystems checks
         utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % devname, log)
-    else:
+    elif (not one_partition):
         log.write("formatting %s btrfs partition (%s).\n" % (fs,devname))
         # 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