From 125badfd13455565dd853684a3ed8025fea79cfe Mon Sep 17 00:00:00 2001 From: rmh Date: Sun, 20 May 2007 07:52:05 +0000 Subject: [PATCH] * patches/partmap_fallback.diff: New. Implement fallback "pc gpt" for partmap detection failures. (Closes: #423022) --- debian/changelog | 4 +++- debian/patches/partmap_fallback.diff | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 debian/patches/partmap_fallback.diff diff --git a/debian/changelog b/debian/changelog index 4f9d5b428..91a94f853 100644 --- 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 Sun, 20 May 2007 09:49:00 +0200 + -- Robert Millan 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 index 000000000..300684b74 --- /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 -- 2.39.5