Merge lp:~cjwatson/partman-partitioning/gpt-boot-partition-855871 into lp:~ubuntu-core-dev/partman-partitioning/ubuntu

[Colin Watson]

On systems with only GPT disks, check that an EFI System Partition or a BIOS Boot Partition exists, as appropriate (LP: #855871). This generally tries to prevent people from shooting themselves in the foot with manual partitioning on such systems (especially Intel Macs).

=== added directory 'check.d'
=== added file 'check.d/_numbers'
--- check.d/_numbers	1970-01-01 00:00:00 +0000
+++ check.d/_numbers	2012-03-20 17:10:22 +0000
@@ -0,0 +1,1 @@
+08 biosgrub

=== added file 'check.d/biosgrub'
--- check.d/biosgrub	1970-01-01 00:00:00 +0000
+++ check.d/biosgrub	2012-03-20 17:10:22 +0000
@@ -0,0 +1,84 @@
+#! /bin/sh
+
+. /lib/partman/lib/base.sh
+
+# Keep this in sync with grub-installer.
+want_method=
+ARCH="$(archdetect)"
+case $ARCH in
+    i386/mac|amd64/mac)
+	if [ -d /sys/firmware/efi ]; then
+	    want_method=efi
+	else
+	    want_method=biosgrub
+	fi
+	;;
+    i386/efi|amd64/efi)
+	want_method=efi
+	;;
+    i386/*|amd64/*|*-i386/*|*-amd64/*)
+	want_method=biosgrub
+	;;
+    *)
+	exit 0
+	;;
+esac
+
+# Do all the disks on this system use GPT?
+found_gpt=no
+found_non_gpt=no
+for dev in $DEVICES/*; do
+	[ -d "$dev" ] || continue
+	cd "$dev"
+	open_dialog GET_LABEL_TYPE
+	read_line label_type
+	close_dialog
+	if [ "$label_type" = gpt ]; then
+		found_gpt=yes
+	else
+		found_non_gpt=yes
+	fi
+done
+if [ "$found_gpt" = no ] || [ "$found_non_gpt" = yes ]; then
+	# We might be intending to boot from one of the non-GPT disks.
+	exit 0
+fi
+
+# Is there at least one EFI System Partition or BIOS Boot Partition, as
+# appropriate?
+have_bootable=no
+for dev in $DEVICES/*; do
+	[ -d "$dev" ] || continue
+	cd "$dev"
+	partitions=
+	open_dialog PARTITIONS
+	while { read_line num id size type fs path name; [ "$id" ]; }; do
+		[ "$fs" != free ] || continue
+		partitions="$partitions $id,$num"
+	done
+	close_dialog
+
+	for part in $partitions; do
+		id="${part%,*}"
+		num="${part#*,}"
+		[ -f "$id/method" ] || continue
+		method="$(cat "$id/method")"
+		if [ "$method" = "$want_method" ]; then
+			have_bootable=yes
+			break
+		fi
+	done
+done
+
+if [ "$have_bootable" = no ]; then
+	template="partman-partitioning/no_bootable_gpt_$want_method"
+	db_set "$template" true
+	db_input critical "$template" || true
+	db_go || true
+	db_get "$template"
+	if [ "$RET" = true ]; then
+		exit 1
+	fi
+fi
+
+exit 0

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-19 10:15:44 +0000
+++ debian/changelog	2012-03-20 17:10:22 +0000
@@ -1,3 +1,10 @@
+partman-partitioning (83ubuntu2) UNRELEASED; urgency=low
+
+  * On systems with only GPT disks, check that an EFI System Partition or a
+    BIOS Boot Partition exists, as appropriate (LP: #855871).
+
+ -- Colin Watson <[e-mail]>  Tue, 20 Mar 2012 15:24:58 +0000
+
 partman-partitioning (83ubuntu1) precise; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:

=== modified file 'debian/di-numbers'
--- debian/di-numbers	2009-09-02 14:15:41 +0000
+++ debian/di-numbers	2012-03-20 17:10:22 +0000
@@ -4,3 +4,4 @@
 init.d lib/partman
 update.d lib/partman
 choose_method lib/partman
+check.d lib/partman

=== modified file 'debian/partman-partitioning.templates'
--- debian/partman-partitioning.templates	2009-09-02 14:18:47 +0000
+++ debian/partman-partitioning.templates	2012-03-20 17:10:22 +0000
@@ -277,3 +277,27 @@
 # Up to 10 character positions
 _Description: biosgrub
 
+Template: partman-partitioning/no_bootable_gpt_efi
+Type: boolean
+# :sl5:
+_Description: Go back to the menu and correct this problem?
+ The partition table format in use on your disks normally requires you to
+ create a separate "EFI boot partition" for boot loader code.  Note that
+ this is not the same as a partition mounted on /boot.
+ .
+ If you do not go back to the partitioning menu and correct this error, boot
+ loader installation may fail later, although it may still be possible to
+ install the boot loader to a partition.
+
+Template: partman-partitioning/no_bootable_gpt_biosgrub
+Type: boolean
+# :sl5:
+_Description: Go back to the menu and correct this problem?
+ The partition table format in use on your disks normally requires you to
+ create a separate "Reserved BIOS boot area" for boot loader code.  Note
+ that this is not the same as a partition mounted on /boot.
+ .
+ If you do not go back to the partitioning menu and correct this error, boot
+ loader installation may fail later, although it may still be possible to
+ install the boot loader to a partition.
+