[d-i-commits] r32125 - in trunk/packages/partman/partman-partitioning: debian storage_device/label

[Frans Pop]

Author: fjp
Date: 2005-11-15 21:09:24 +0000 (Tue, 15 Nov 2005)
New Revision: 32125

Modified:
   trunk/packages/partman/partman-partitioning/debian/changelog
   trunk/packages/partman/partman-partitioning/storage_device/label/do_option
Log:
Use gpt instead of msdos disklabel for disks larger than 2TB

Modified: trunk/packages/partman/partman-partitioning/debian/changelog
===================================================================
--- trunk/packages/partman/partman-partitioning/debian/changelog	2005-11-15 20:49:29 UTC (rev 32124)
+++ trunk/packages/partman/partman-partitioning/debian/changelog	2005-11-15 21:09:24 UTC (rev 32125)
@@ -9,8 +9,11 @@
   [ Colin Watson ]
   * Use 'rm -f' rather than more awkward test-then-remove constructions.
 
- -- Joey Hess <joeyh at debian.org>  Sun,  2 Oct 2005 17:30:46 -0400
+  [ Frans Pop ]
+  * Use gpt instead of msdos disklabel for disks larger than 2TB.
 
+ -- Frans Pop <fjp at debian.org>  Tue, 15 Nov 2005 22:08:47 +0100
+
 partman-partitioning (36) unstable; urgency=low
 
   * Localise several variables in get_ntfs_resize_range, to avoid stomping

Modified: trunk/packages/partman/partman-partitioning/storage_device/label/do_option
===================================================================
--- trunk/packages/partman/partman-partitioning/storage_device/label/do_option	2005-11-15 20:49:29 UTC (rev 32124)
+++ trunk/packages/partman/partman-partitioning/storage_device/label/do_option	2005-11-15 21:09:24 UTC (rev 32125)
@@ -20,7 +20,19 @@
 
 db_subst partman-partitioning/choose_label CHOICES "$types"
 PRIORITY=critical
+
 default_label=$(default_disk_label)
+
+# Use gpt instead of msdos disklabel for disks larger than 2TB
+if expr "$types" : ".*gpt.*" >/dev/null; then
+	if [ "$default_label" = msdos ] ; then
+		disksize=$(cat size)
+		if $(longint_le $(human2longint 2TB) $disksize) ; then
+			default_label=gpt
+		fi
+	fi
+fi
+
 if expr "$types" : ".*${default_label}.*" >/dev/null; then
 	db_set partman-partitioning/choose_label "$default_label"
 	PRIORITY=low