2009-08-23 Colin Watson <cjwatson@ubuntu.com>

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

diff --git a/ChangeLog b/ChangeLog
index ba1fdfef99914ff0d61406e7be539d77ee9e0d5f..50c1cd4a8c15a7379614ef72c905971bf6b3bfd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-23  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/30_os-prober.in: Disable os-prober if
+       `GRUB_DISABLE_OS_PROBER' was set to true.
+
 2009-08-23  Robert Millan  <rmh.grub@aybabtu.com>
 
        * partmap/pc.c: Rename to ...

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index b36c2a3660fe1378d8fcb374a71f63ec58ed8ae0..ffc46c9d4e316d7aecd8287f6fe0da36bcfa46e7 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -22,6 +22,10 @@ libdir=@libdir@
 
 . ${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