grub 0.97-47 (Re: (grub) pre-approval for #495909)

[Robert Millan <rmh@aybabtu.com>]

On Sun, Aug 31, 2008 at 07:34:18PM +0200, Luk Claes wrote:
> Robert Millan wrote:
> > Hi,
> > 
> > Please would you pre-approve fixing #495909 ?  It is an annoying (but
> > otherwise harmless) collateral result of:
> > 
> >   * Handle errors in RAID/LVM scan routine (rather than letting the upper
> >     layer cope with them).  (Closes: #494501, #495049)
> >     - debian/patches/00_raid_lvm_error_handling.diff: Fix the actual problem.
> >     - debian/patches/00_grub_print_error.diff: Fix a bug exposed by
> >       00_raid_lvm_error_handling.diff.
> > 
> > from 1.96+20080724-8.
> > 
> > Which was a correct change from grub2 POV, since these errors had to be
> > printed instead of silenced;  however for grub (legacy) it's not, since
> > some of these errors have no meaning there (as Martin correctly spotted).
> > 
> > My fix (only for grub, not grub2) would be to simply send grub-probe stderr
> > output to /dev/null.  It's no great loss, and I think it's the simplest &
> > most suitable solution for lenny.
> 
> ok, please upload.

Ok.  This is in grub 0.97-47;  debdiff attached.

Thanks

-- 
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
@@ -115,7 +115,7 @@
 	if ! test -e ${device_map} ; then
 		echo quit | grub --batch --no-floppy --device-map=${device_map} > /dev/null
 	fi
-	grub-probe --device-map=${device_map} -t device $1
+	grub-probe --device-map=${device_map} -t device $1 2> /dev/null
 }
 
 # Usage: convert_raid1 os_device
@@ -152,7 +152,7 @@
 	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"
+	GRUB_LEGACY_0_BASED_PARTITIONS=1 grub-probe --device-map=${device_map} -t drive -d "$1" 2> /dev/null
 }
 
 # Usage: convert_default os_device
@@ -196,7 +196,7 @@
 kernel_dir=`make_system_path_relative_to_its_root /boot`
 
 # the "-t abstraction" check is a workaround untill #484297 is fixed
-if abstraction=`grub-probe -t abstraction --device ${root_device}` && [ "$abstraction" = "" ] && \
+if abstraction=`grub-probe -t abstraction --device ${root_device} 2> /dev/null` && [ "$abstraction" = "" ] && \
     root_uuid=`grub-probe --device-map=${device_map} --device ${root_device} --target=fs_uuid 2> /dev/null` && \
     test -e "/dev/disk/by-uuid/${root_uuid}" ; then
   linux_root_device=UUID=${root_uuid}
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,9 @@
+grub (0.97-47) unstable; urgency=high
+
+  * update-grub: Send grub-probe stderr output to /dev/null.  (Closes: #495909)
+
+ -- Robert Millan <rmh@aybabtu.com>  Sun, 31 Aug 2008 20:03:11 +0200
+
 grub (0.97-46) unstable; urgency=high
 
   * Bring the rc/pre/etc exceptions back again when comparing versions.