Hi, Would it be okay to also unblock grub-installer for this? (I hope the attached debdiff is self-explanatory). Thanks, Regards, -- Steven Chamberlain steven@pyro.eu.org
diff -Nru --exclude '*.po' grub-installer-1.83/debian/changelog grub-installer-1.84/debian/changelog
--- grub-installer-1.83/debian/changelog 2012-10-27 07:07:35.000000000 +0100
+++ grub-installer-1.84/debian/changelog 2012-12-16 16:28:47.000000000 +0000
@@ -1,3 +1,14 @@
+grub-installer (1.84) unstable; urgency=low
+
+ * Add workaround for #681227. Won't mark it as closed, since I didn't
+ find the root cause, but with this at least we can downgrade the
+ severity.
+ * Apply patch from Arno Töll to fix / on ZFS where /boot isn't.
+ Closes: #651720.
+ * Add $SELF to uploaders
+
+ -- Wouter Verhelst <wouter@debian.org> Sun, 16 Dec 2012 17:28:47 +0100
+
grub-installer (1.83) unstable; urgency=low
[ Milan Kupcevic ]
diff -Nru --exclude '*.po' grub-installer-1.83/debian/control grub-installer-1.84/debian/control
--- grub-installer-1.83/debian/control 2012-09-22 02:04:36.000000000 +0100
+++ grub-installer-1.84/debian/control 2012-12-16 16:28:04.000000000 +0000
@@ -2,7 +2,7 @@
Section: debian-installer
Priority: standard
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Otavio Salvador <otavio@debian.org>, Felix Zielcke <fzielcke@z-51.de>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
+Uploaders: Otavio Salvador <otavio@debian.org>, Felix Zielcke <fzielcke@z-51.de>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>, Wouter Verhelst <wouter@debian.org>
Build-Depends: debhelper (>= 7.3.10~), po-debconf (>= 0.5.0), libparted-dev
Vcs-Browser: http://git.debian.org/?p=d-i/grub-installer.git
Vcs-Git: git://git.debian.org/d-i/grub-installer.git
diff -Nru --exclude '*.po' grub-installer-1.83/grub-installer grub-installer-1.84/grub-installer
--- grub-installer-1.83/grub-installer 2012-10-25 02:01:57.000000000 +0100
+++ grub-installer-1.84/grub-installer 2012-12-16 16:16:28.000000000 +0000
@@ -221,8 +221,10 @@
bootfs=$(findfs /boot)
[ -n "$bootfs" ] || bootfs="$rootfs"
+
bootfstype=$(findfstype /boot)
-[ -n "$bootfstype" ] || bootfstype="$(findfstype /)"
+rootfstype="$(findfstype /)"
+[ -n "$bootfstype" ] || bootfstype=$rootfstype
case $ARCH in
powerpc/chrp|powerpc/chrp_rs6k|powerpc/chrp_ibm|powerpc/cell)
@@ -643,11 +645,16 @@
update_mtab
-if [ -z "$frdisk" ]; then
+installed=0
+if [ -z "$frdisk" ]; then
# Install grub on each space separated disk in the list
bootdevs="$bootdev"
for bootdev in $bootdevs; do
+ # workaround for #681227
+ if [ ! -b $bootdev ]; then
+ continue
+ fi
grub_install_params=
if ! is_floppy "$bootdev"; then
if $chroot $ROOT grub-install -h 2>&1 | grep -q no-floppy; then
@@ -683,6 +690,7 @@
esac
if [ "$CODE" = 0 ]; then
info "grub-install ran successfully"
+ installed=$(( $installed + 1 ))
else
case $ARCH:$grub_package in
*:grub|*:grub-pc|*:grub-efi|sparc:grub-ieee1275)
@@ -699,7 +707,12 @@
exit 1
fi
done
-
+ if [ $installed -lt 1 ]; then
+ error "no boot device found to install to"
+ # we should probably show an error message here, but I believe
+ # we're in string freeze...
+ exit 1
+ fi
else
# Semi-manual grub setup for Serial ATA RAID/multipath
@@ -851,7 +864,7 @@
db_progress STEP 1
db_progress INFO grub-installer/progress/step_config_loader
-if [ "$bootfstype" = "zfs" ]; then
+if [ "$bootfstype" = "zfs" ] || [ "$rootfstype" = "zfs" ] ; then
# Required by update-grub on ZFS
mkdir -p $ROOT/boot/zfs
cp /boot/zfs/zpool.cache $ROOT/boot/zfs/
Attachment:
signature.asc
Description: OpenPGP digital signature