merge master into lxc_devel

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

diff --git a/source/steps/InstallPartitionDisks.py b/source/steps/InstallPartitionDisks.py
index 3db5466..9ecdc86 100644 (file)
--- a/source/steps/InstallPartitionDisks.py
+++ b/source/steps/InstallPartitionDisks.py
@@ -174,7 +174,7 @@ def Run( vars, log ):
     utils.sysexec( "mkfs.btrfs %s" % (devname), log )
 
     # disable time/count based filesystems checks
-    for filesystem in ("root"):
+    for filesystem in ["root"]:
         utils.sysexec_noerr( "tune2fs -c -1 -i 0 %s" % PARTITIONS[filesystem], log)
 
     # save the list of block devices in the log
@@ -265,7 +265,11 @@ def single_partition_device_2_x ( device, vars, log):
         # get the device
         dev= parted.Device(device)
         # create a new partition table
-        disk= parted.freshDisk(dev,'msdos')
+        try:
+            disk= parted.freshDisk(dev,'msdos')
+        # use gpt as a fallback for disks larger than 2TB
+        except:
+            disk= parted.freshDisk(dev,'gpt')
         # create one big partition on each block device
         constraint= parted.constraint.Constraint (device=dev)
         geometry = parted.geometry.Geometry (device=dev, start=0, end=1)