e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
107 lines
4.5 KiB
Diff
107 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 4 Sep 2014 16:49:25 -0400
|
|
Subject: [PATCH] Add GRUB_DISABLE_UUID.
|
|
|
|
This will cause "search --fs-uuid --set=root ..." not to be generated by
|
|
grub2-mkconfig, and instead simply attempt to use the grub device name
|
|
as it understands it.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
docs/grub.texi | 7 +++++++
|
|
util/grub-mkconfig.in | 22 +++++++++++++++++++---
|
|
util/grub-mkconfig_lib.in | 4 ++--
|
|
3 files changed, 28 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/docs/grub.texi b/docs/grub.texi
|
|
index 87795075a87..6f524305085 100644
|
|
--- a/docs/grub.texi
|
|
+++ b/docs/grub.texi
|
|
@@ -1441,6 +1441,13 @@ enable the use of partition UUIDs, set this option to @samp{false}.
|
|
If this option is set to @samp{true}, disable the generation of recovery
|
|
mode menu entries.
|
|
|
|
+@item GRUB_DISABLE_UUID
|
|
+Normally, @command{grub-mkconfig} will generate menu entries that use
|
|
+universally-unique identifiers (UUIDs) to identify various filesystems to
|
|
+search for files. This is usually more reliable, but in some cases it may
|
|
+not be appropriate. To disable this use of UUIDs, set this option to
|
|
+@samp{true}.
|
|
+
|
|
@item GRUB_VIDEO_BACKEND
|
|
If graphical video support is required, either because the @samp{gfxterm}
|
|
graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
|
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
index 523d4e029bb..9ecbcfb5b43 100644
|
|
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -133,12 +133,12 @@ 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
|
|
+GRUB_DEVICE_UUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
|
|
+GRUB_DEVICE_PARTUUID_GENERATED="`${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`"
|
|
-GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
|
|
+GRUB_DEVICE_BOOT_UUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
|
|
|
|
# Filesystem for the device containing our userland. Used for stuff like
|
|
# choosing Hurd filesystem module.
|
|
@@ -158,6 +158,21 @@ if test -f ${sysconfdir}/default/grub ; then
|
|
. ${sysconfdir}/default/grub
|
|
fi
|
|
|
|
+if [ "x$GRUB_DISABLE_UUID" != "xtrue" ]; then
|
|
+ if [ -z "$GRUB_DEVICE_UUID" ]; then
|
|
+ GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
|
|
+ fi
|
|
+ if [ -z "$GRUB_DEVICE_BOOT_UUID" ]; then
|
|
+ GRUB_DEVICE_BOOT_UUID="$GRUB_DEVICE_BOOT_UUID_GENERATED"
|
|
+ fi
|
|
+ if [ -z "$GRUB_DEVICE_UUID" ]; then
|
|
+ GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
|
|
+ fi
|
|
+ if [ -z "$GRUB_DEVICE_PART_UUID" ]; then
|
|
+ GRUB_DEVICE_PART_UUID="$GRUB_DEVICE_PART_UUID_GENERATED"
|
|
+ fi
|
|
+fi
|
|
+
|
|
# XXX: should this be deprecated at some point?
|
|
if [ "x${GRUB_TERMINAL}" != "x" ] ; then
|
|
GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
|
|
@@ -227,6 +242,7 @@ export GRUB_DEFAULT \
|
|
GRUB_DISABLE_LINUX_UUID \
|
|
GRUB_DISABLE_LINUX_PARTUUID \
|
|
GRUB_DISABLE_RECOVERY \
|
|
+ GRUB_DISABLE_UUID \
|
|
GRUB_VIDEO_BACKEND \
|
|
GRUB_GFXMODE \
|
|
GRUB_BACKGROUND \
|
|
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
|
index 0f801cab3e4..1001a12232b 100644
|
|
--- a/util/grub-mkconfig_lib.in
|
|
+++ b/util/grub-mkconfig_lib.in
|
|
@@ -156,7 +156,7 @@ prepare_grub_to_access_device ()
|
|
if [ "x$fs_hint" != x ]; then
|
|
echo "set root='$fs_hint'"
|
|
fi
|
|
- if fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then
|
|
+ if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then
|
|
hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=
|
|
echo "if [ x\$feature_platform_search_hint = xy ]; then"
|
|
echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
|
|
@@ -173,7 +173,7 @@ grub_get_device_id ()
|
|
IFS='
|
|
'
|
|
device="$1"
|
|
- if fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then
|
|
+ if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then
|
|
echo "$fs_uuid";
|
|
else
|
|
echo $device |sed 's, ,_,g'
|