upstream bug: https://savannah.gnu.org/bugs/?48228
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=581904
---
util/grub-mkconfig.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f8496d28b..c4544460c 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -132,16 +132,16 @@ else
fi
# Device containing our userland. Typically used for root= parameter.
-GRUB_DEVICE="`${grub_probe} --target=device /`"
-GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid
2> /dev/null`" || true
+GRUB_DEVICE="`${grub_probe} --target=device / | sort | head -n1`"
+GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid
2> /dev/null` | sort | head -n1" || true
# Device containing our /boot partition. Usually the same as GRUB_DEVICE.
-GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
-GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT}
--target=fs_uuid 2> /dev/null`" || true
+GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot | sort | head -n1`"
+GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT}
--target=fs_uuid 2> /dev/null` | sort | head -n1" || true
# Filesystem for the device containing our userland. Used for stuff like
# choosing Hurd filesystem module.
-GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null
|| echo unknown`"
+GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null
|| echo unknown | sort | head -n1`"
if [ x"$GRUB_FS" = xunknown ]; then
GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
--
2.13.0
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
