* patches/partmap_fallback.diff: New. Implement fallback "pc gpt" for partmap

    detection failures.  (Closes: #423022)

diff --git a/debian/changelog b/debian/changelog
index 4f9d5b42881fef7119414dc416d28698ec23cb64..91a94f853315c6c5c87d02b60c8a3533f3c2f38d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ grub2 (1.95+20070519-1) unstable; urgency=low
   * legacy/update-grub: Get rid of all grub-set-default calls.  (Closes: #425054)
   * grub-{pc,efi,of}.postinst: Only run update-grub if grub.cfg already exists.
   * grub-pc.postinst: Only run GRUB Legacy compat stuff if menu.lst is found.
+  * patches/partmap_fallback.diff: New.  Implement fallback "pc gpt" for partmap
+    detection failures.  (Closes: #423022)
 
- -- Robert Millan <rmh@aybabtu.com>  Sun, 20 May 2007 09:49:00 +0200
+ -- Robert Millan <rmh@aybabtu.com>  Sun, 20 May 2007 09:53:08 +0200
 
 grub2 (1.95+20070515-1) unstable; urgency=low
 

diff --git a/debian/patches/partmap_fallback.diff b/debian/patches/partmap_fallback.diff
new file mode 100644 (file)
index 0000000..300684b
--- /dev/null
+++ b/debian/patches/partmap_fallback.diff
@@ -0,0 +1,24 @@
+diff -ur grub2-1.95+20070516.old/util/i386/efi/grub-install.in grub2-1.95+20070516/util/i386/efi/grub-install.in
+--- grub2-1.95+20070516.old/util/i386/efi/grub-install.in      2007-05-16 17:05:02.000000000 +0200
++++ grub2-1.95+20070516/util/i386/efi/grub-install.in  2007-05-20 09:51:51.000000000 +0200
+@@ -187,7 +187,7 @@
+ fi
+ 
+ # Then the partition map module.
+-partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir}`
++partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} || echo pc gpt`
+ if test "x$partmap_module" = x -a "x$modules" = x; then
+     echo "Auto-detection of a partition map module failed." 1>&2
+     echo "Please specify the module with the option \`--modules' explicitly." 1>&2
+diff -ur grub2-1.95+20070516.old/util/i386/pc/grub-install.in grub2-1.95+20070516/util/i386/pc/grub-install.in
+--- grub2-1.95+20070516.old/util/i386/pc/grub-install.in       2007-05-07 21:54:46.000000000 +0200
++++ grub2-1.95+20070516/util/i386/pc/grub-install.in   2007-05-20 09:51:39.000000000 +0200
+@@ -217,7 +217,7 @@
+ fi
+ 
+ # Then the partition map module.
+-partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir}`
++partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} || echo pc gpt`
+ if test "x$partmap_module" = x -a "x$modules" = x; then
+     echo "Auto-detection of a partition map module failed." 1>&2
+     echo "Please specify the module with the option \`--modules' explicitly." 1>&2