2009-09-19 Colin Watson <cjwatson@ubuntu.com>

	* util/grub.d/30_os-prober.in: Don't throw away stderr from
	  os-prober. Under normal operation, it does not print anything to
	  stderr; if it does, we need to debug it, and throwing away stderr
	  makes that excessively difficult.

diff --git a/ChangeLog b/ChangeLog
index 5d836659c617d1e55db65c0d5d80c02a3d47fac6..4144fbe2b5a6dad055ed5b3f3c15799283d3a253 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-19  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/30_os-prober.in: Don't throw away stderr from
+         os-prober. Under normal operation, it does not print anything to
+         stderr; if it does, we need to debug it, and throwing away stderr
+         makes that excessively difficult.
+
 2009-09-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * mmap/mmap.c (grub_cmd_badram): Fix off-by-one error.

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 4a1648881e51e8260b27a50e427e9c7d7e43e116..84e227ee71a69c5183b465cca9007c3630af06d7 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -31,7 +31,7 @@ if [ -z "`which os-prober 2> /dev/null`" -o -z "`which linux-boot-prober 2> /dev
   exit 0
 fi
 
-OSPROBED="`os-prober 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
+OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
 if [ -z "${OSPROBED}" ] ; then
   # empty os-prober output, nothing doing
   exit 0