Update grub-mkconfig.in and 10_linux.in to support grub-probe's new
partuuid target.
Signed-off-by: Nicholas Vinson <nvinson...@gmail.com>
---
util/grub-mkconfig.in | 2 ++
util/grub.d/10_linux.in | 11 +++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f8496d2..fc42462 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -134,6 +134,7 @@ 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_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid
2> /dev/null`" || true
# Device containing our /boot partition. Usually the same as GRUB_DEVICE.
GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
@@ -182,6 +183,7 @@ if [ "x${GRUB_ACTUAL_DEFAULT}" = "xsaved" ] ; then
GRUB_ACTUAL_DEFAULT="`"${grub
# override them.
export GRUB_DEVICE \
GRUB_DEVICE_UUID \
+ GRUB_DEVICE_PARTUUID \
GRUB_DEVICE_BOOT \
GRUB_DEVICE_BOOT_UUID \
GRUB_FS \
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index de9044c..8081fdb 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -220,8 +220,15 @@ while [ "x$list" != "x" ] ; do
gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
elif test -z "${initramfs}" ; then
# "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
- # no initrd or builtin initramfs, it can't work here.
- linux_root_device_thisversion=${GRUB_DEVICE}
+ # no initrd or builtin initramfs, it can't work here. However, if
+ # GRUB_DEVICE_PARTUUID is not empty we can use that here if
+ # GRUD_DISABLE_LINUX_UUID is not set to true.
+ if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xtrue" ]
+ && [ "x${GRUB_DEVICE_PARTUUID}" != "x" ]; then
+ linux_root_device_thisversion="PARTUUID=${GRUB_DEVICE_PARTUUID}"
+ else
+ linux_root_device_thisversion=${GRUB_DEVICE}
+ fi
fi
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
--
2.9.0
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
