[EFI] partman-partitioning: use GPT for EFI machines

[Steve McIntyre <steve@einval.com>]

Hi,

Trivial patch to not use GPT partitioning by default when we're on an
EFI machine. Depends on the libdebian-installer patch to add the "efi"
subarch. Merged the amd64 and i386 cases now they're common.

-- 
Steve McIntyre, Cambridge, UK.                                steve@einval.com
"Every time you use Tcl, God kills a kitten." -- Malcolm Ray

mr diff: /home/steve/debian/d-i/d-i/packages/partman-partitioning
diff --git a/debian/changelog b/debian/changelog
index b5a529c..97e74aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+partman-partitioning (88) unstable; urgency=low
+
+  * On x86 machines booted in EFI mode, use gpt disk label by default.
+
+ -- Steve McIntyre <93sam@debian.org>  Tue, 21 Aug 2012 20:22:32 +0100
+
 partman-partitioning (87) unstable; urgency=low
 
   * Team upload
diff --git a/lib/disk-label.sh b/lib/disk-label.sh
index c981cd9..f424fc9 100644
--- a/lib/disk-label.sh
+++ b/lib/disk-label.sh
@@ -20,9 +20,9 @@ default_disk_label () {
 		fi;;
 	    arm|armeb|armel|armhf)
 		echo msdos;;
-	    amd64|kfreebsd-amd64)
+	    amd64|kfreebsd-amd64|i386|kfreebsd-i386|hurd-i386)
 		case "$sub" in
-		    mac)
+		    mac|efi)
 			echo gpt;;
 		    *)
 			echo msdos;;
@@ -31,13 +31,6 @@ default_disk_label () {
 		echo msdos;;
 	    ia64)
 		echo gpt;;
-	    i386|kfreebsd-i386|hurd-i386)
-		case "$sub" in
-		    mac)
-			echo gpt;;
-		    *)
-			echo msdos;;
-		esac;;
 	    m68k)
 		case "$sub" in
 		    amiga)

mr diff: finished (1 ok)