grub 0.97-47lenny1

[Robert Millan <rmh@aybabtu.com>]

Hi,

Please consider unblocking grub 0.97-47lenny1.  It fixes two RC bugs.

debdiff attached

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

diff -u grub-0.97/debian/update-grub grub-0.97/debian/update-grub
--- grub-0.97/debian/update-grub
+++ grub-0.97/debian/update-grub
@@ -152,7 +152,17 @@
 	if ! test -e ${device_map} ; then
 		echo quit | grub --batch --no-floppy --device-map=${device_map} > /dev/null
 	fi
-	GRUB_LEGACY_0_BASED_PARTITIONS=1 grub-probe --device-map=${device_map} -t drive -d "$1" 2> /dev/null
+	GRUB_LEGACY_0_BASED_PARTITIONS=1 grub-probe --device-map=${device_map} -t drive -d "$1" 2> /dev/null || { 
+		echo "warning: grub-probe can't find drive for $1." >&2
+		tmp_map=$(mktemp -t device.map.XXXXXXXX)
+		grub-mkdevicemap --device-map=${tmp_map} --no-floppy >/dev/null 2>&1 || true
+		GRUB_LEGACY_0_BASED_PARTITIONS=1 grub-probe --device-map=${tmp_map} -t drive -d "$1" || {
+			rm -f ${tmp_map}
+			return 1
+		}
+		echo "Please check ${device_map}, you might have to regenerate it with grub-mkdevicemap." >&2
+		rm -f ${tmp_map}
+	}
 }
 
 # Usage: convert_default os_device
@@ -749,7 +759,7 @@
 fi
 
 xen0Kernels=""
-# First old style non-CONFIG_PARAVIRT kernels with xen0 support.
+# First kernels with xen0 support.
 for ver in `grep -l CONFIG_XEN=y /boot/config* | sed -e s%/boot/config-%%`; do
   if ! grep -q CONFIG_XEN_PRIVILEGED_GUEST=y /boot/config-$ver ; then
       continue
@@ -774,32 +784,6 @@
     fi
 done
 
-# Second new style CONFIG_PARAVIRT kernels with xen support. There is
-# no distinction between xen0 and xenU in these kernels.
-for ver in `grep -l CONFIG_PARAVIRT=y /boot/config* | sed -e s%/boot/config-%%`; do
-  if ! grep -q CONFIG_XEN=y /boot/config-$ver ; then
-      continue
-  fi
-  # ver is a kernel version
-  kern="/boot/vmlinuz-$ver"
-  if [ -r $kern ] ; then
-       newerKernels=""
-       for i in $xen0Kernels ; do
-                res=$(CompareVersions "$kern" "$i")
-                if [ "$kern" != "" ] && [ "$res" -gt 0 ] ; then
-                        newerKernels="$newerKernels $kern $i"
-                        kern=""
-                else
-                        newerKernels="$newerKernels $i"
-                fi
-        done
-        if [ "$kern" != "" ] ; then
-                newerKernels="$newerKernels $kern"
-        fi
-        xen0Kernels="$newerKernels"
-    fi
-done
-
 sortedKernels=""
 for kern in $(/bin/ls -1vr /boot | grep -v "dpkg-*" | grep "^vmlinuz-") ; do
         kern="/boot/$kern"
diff -u grub-0.97/debian/changelog grub-0.97/debian/changelog
--- grub-0.97/debian/changelog
+++ grub-0.97/debian/changelog
@@ -1,3 +1,12 @@
+grub (0.97-47lenny1) unstable; urgency=high
+
+  * update-grub: Try to regenerate device.map when grub-probe fails (and
+    inform the user about it).  Thanks Raphaël Hertzog.  (Closes: #501306)
+  * update-grub: Do not attempt to detect CONFIG_PARAVIRT Xen images.
+    Thanks Raphaël Hertzog et al.  (Closes: #500336)
+
+ -- Robert Millan <rmh@aybabtu.com>  Fri,  7 Nov 2008 19:28:46 +0100
+
 grub (0.97-47) unstable; urgency=high
 
   * update-grub: Send grub-probe stderr output to /dev/null.  (Closes: #495909)