Fix platform postinsts to handle new core.img location.

This commit is contained in:
Colin Watson 2012-09-14 10:30:12 +01:00
parent bc3b27c929
commit 72f466bca8
2 changed files with 9 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
grub2 (2.00-4) UNRELEASED; urgency=low
* Fix platform postinsts to handle new core.img location.
-- Colin Watson <cjwatson@debian.org> Fri, 14 Sep 2012 10:28:00 +0100
grub2 (2.00-3) experimental; urgency=low
* Use dh-autoreconf.

4
debian/postinst.in vendored
View File

@ -312,7 +312,8 @@ case "$1" in
grub-pc)
mkdir -p /boot/grub
if test -e /boot/grub/device.map && ! test -e /boot/grub/core.img ; then
if test -e /boot/grub/device.map && ! test -e /boot/grub/core.img && \
! test -e /boot/grub/@CPU_PLATFORM@/core.img; then
# Looks like your device.map was generated by GRUB Legacy, which
# used to generate broken device.map (see #422851). Avoid the risk
# by regenerating it.
@ -433,6 +434,7 @@ case "$1" in
touch /boot/grub/grub.cfg
fi
elif test -z "$2" || test -e /boot/grub/core.img || \
test -e /boot/grub/@CPU_PLATFORM@/core.img || \
test "$UPGRADE_FROM_GRUB_LEGACY" || test "$wubi_device"; then
question=grub-pc/install_devices
device_map="$(grub-mkdevicemap -m - | grep -v '^(fd[0-9]\+)' || true)"