Bug#695048: installation-reports: Must manually reboot into non-EFI mode

[Steve McIntyre <steve@einval.com>]

reassign 695048 partman-efi
thanks

On Tue, Dec 25, 2012 at 07:47:34PM +0100, Cyril Brulebois wrote:
>Hi Steve,
>
>any insight on this one?

Basically, our existing EFI support doesn't recognise pre-existing EFI
partitions on dos-partitioned disks. Trivial patch for partman-efi
here. OK to commit? I think it's a safe thing to add for RC1...

diff --git a/debian/changelog b/debian/changelog
index ac58e25..b699596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+partman-efi (34) unstable; urgency=low
+
+  [ Steve McIntyre ]
+  * Recognise already-formatted EFI system partitions on msdos-labelled
+    disks. Closes: #695048
+
+ -- Steve McIntyre <93sam@debian.org>  Thu, 17 Jan 2013 02:50:13 +0000
+
 partman-efi (33) unstable; urgency=low
 
   [ Updated translations ]
diff --git a/init.d/efi b/init.d/efi
index 3c5a7d2..8955718 100755
--- a/init.d/efi
+++ b/init.d/efi
@@ -28,6 +28,7 @@ fi
 . /lib/partman/lib/base.sh
 
 gpt_efi_type=c12a7328-f81f-11d2-ba4b-00a0c93ec93b
+msdos_efi_type=0xef
 
 for dev in /var/lib/partman/devices/*; do
        [ -d "$dev" ] || continue
@@ -45,6 +46,9 @@ for dev in /var/lib/partman/devices/*; do
                elif [ "$fs" = fat32 ] && echo "$name" |
                      grep -i "^EFI System Partition" >/dev/null; then
                        partitions="$partitions $id"
+               elif [ "$label_type" = msdos ] && \
+                    [ "$(blkid -o value -s PART_ENTRY_TYPE -p "$path" 2>/dev/null)" = "$msdos_efi_type" ]; then
+                       partitions="$partitions $id"
                elif [ "$label_type" = gpt ] && \
                     [ "$(blkid -o value -s PART_ENTRY_TYPE -p "$path" 2>/dev/null)" = "$gpt_efi_type" ]; then
                        partitions="$partitions $id"


-- 
Steve McIntyre, Cambridge, UK.                                steve@einval.com
"This dress doesn't reverse." -- Alden Spiess