From c8c80635ae021b400a92eaa09f13b74ad2df48c4 Mon Sep 17 00:00:00 2001
From: robertmh <robertmh@localhost>
Date: Sun, 23 Aug 2009 12:59:22 +0000
Subject: [PATCH] 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.
---
 ChangeLog                   | 5 +++++
 util/grub.d/30_os-prober.in | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ba1fdfef9..50c1cd4a8 100644
--- 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 b36c2a366..ffc46c9d4 100644
--- 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