[2514] 2009-08-23 Colin Watson <address@hidden>

[Robert Millan]

Revision: 2514
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2514
Author:   robertmh
Date:     2009-08-23 12:59:22 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
2009-08-23  Colin Watson  <address@hidden>

        * util/grub.d/30_os-prober.in: Disable os-prober if
        `GRUB_DISABLE_OS_PROBER' was set to true.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub.d/30_os-prober.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-23 12:00:57 UTC (rev 2513)
+++ trunk/grub2/ChangeLog       2009-08-23 12:59:22 UTC (rev 2514)
@@ -1,3 +1,8 @@
+2009-08-23  Colin Watson  <address@hidden>
+
+       * util/grub.d/30_os-prober.in: Disable os-prober if
+       `GRUB_DISABLE_OS_PROBER' was set to true.
+
 2009-08-23  Robert Millan  <address@hidden>
 
        * partmap/pc.c: Rename to ...

Modified: trunk/grub2/util/grub.d/30_os-prober.in
===================================================================
--- trunk/grub2/util/grub.d/30_os-prober.in     2009-08-23 12:00:57 UTC (rev 
2513)
+++ trunk/grub2/util/grub.d/30_os-prober.in     2009-08-23 12:59:22 UTC (rev 
2514)
@@ -22,6 +22,10 @@
 
 . ${libdir}/grub/grub-mkconfig_lib
 
+if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
+  exit 0
+fi
+
 if [ -z "`which os-prober 2> /dev/null`" -o -z "`which linux-boot-prober 2> 
/dev/null`" ] ; then
   # missing os-prober and/or linux-boot-prober
   exit 0