← Back to branch summary

~ubuntu-branches/ubuntu/lucid/grub2/lucid

« back to all changes in this revision

Viewing changes to debian/patches/964_os-prober_errors.diff

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-09-18 18:47:06 UTC
  • Revision ID: james.westby@ubuntu.com-20090918184706-3t4dpcnk9k0b8uj7
Tags: 1.97~beta3-1ubuntu5
https://launchpad.net/bugs/431179
* debian/patches/957_savedefault.diff: Quote the value assigned to
  'default', in case it contains spaces (LP: #431179).
* debian/patches/964_os-prober_errors.diff: Don't throw away errors from
  os-prober; it makes things hard to debug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/964_os-prober_errors.diff
 
1
Upstream: Not yet, but can be.
 
2
Description: Don't throw away errors from os-prober; it makes things hard to
 
3
 debug.
 
4
 
 
5
diff -Nur -x '*.orig' -x '*~' grub2-1.97~beta3/util/grub.d/30_os-prober.in grub2-1.97~beta3.new/util/grub.d/30_os-prober.in
 
6
--- grub2-1.97~beta3/util/grub.d/30_os-prober.in        2009-09-18 18:44:44.000000000 +0100
 
7
+++ grub2-1.97~beta3.new/util/grub.d/30_os-prober.in    2009-09-18 18:46:19.000000000 +0100
 
8
@@ -73,7 +73,7 @@
 
9
   exit 0
 
10
 fi
 
11
 
 
12
-OSPROBED="`os-prober 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
 
13
+OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
 
14
 if [ -z "${OSPROBED}" ] ; then
 
15
   # empty os-prober output, nothing doing
 
16
   adjust_timeout