From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 8 Sep 2010 12:29:32 +0000 (+0200)
Subject: 2010-09-08  Robert Millan  <rmh@gnu.org>
X-Git-Tag: 1.99~571
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99fd620d5af6c9d3235adfb4210c881d82364400;p=thirdparty%2Fgrub.git

2010-09-08  Robert Millan  <rmh@gnu.org>

	* util/grub-mkconfig.in: Pass `--device ${GRUB_DEVICE}' when
	initializing `GRUB_FS'.
---

diff --git a/ChangeLog b/ChangeLog
index 73db891d4..0e1285c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-08  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-mkconfig.in: Pass `--device ${GRUB_DEVICE}' when
+	initializing `GRUB_FS'.
+
 2010-09-08  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Not command (!) support to GRUB script.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 828b54bce..6f1d375a7 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -158,7 +158,7 @@ GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_u
 
 # Filesystem for the device containing our userland.  Used for stuff like
 # choosing Hurd filesystem module.
-GRUB_FS="`${grub_probe} --target=fs / 2> /dev/null || echo unknown`"
+GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
 
 if test -f ${sysconfdir}/default/grub ; then
   . ${sysconfdir}/default/grub