Skip to contentSkip to conversation

Add GRUB_DISABLE_UUID

PATCH Superseded Javier Martinez Canillas 3 participants 7 messages Sep 30, 2019 – Oct 22, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Add GRUB_DISABLE_UUID

From: Peter Jones <[email protected]>

The grub-mkconfig and 10_linux scripts by default attempt to use a UUID to set the root kernel command line parameter and the $root GRUB environment variable.

The former can be disabled by setting the GRUB_DISABLE_LINUX_UUID variable to "true", but there is currently no way to disable the latter.

The generated grub config uses the search command with the --fs-uuid option to find the device that has to be set as $root, i.e:

search --no-floppy --fs-uuid --set=root ...

This is usually more reliable but in some cases it may not be appropriate, so this patch introduces a new GRUB_DISABLE_UUID variable that can be used to disable searching for the $root device by filesystem UUID.

When disabled, the $root device will be set to the value specified in the device.map as found by the grub-probe --target=compatibility_hint option.

When setting GRUB_DISABLE_UUID=true, the GRUB_DISABLE_LINUX_UUID and GRUB_DISABLE_LINUX_PARTUUID variables will also be set to "true" unless these have been explicitly set to "false".

That way, the GRUB_DISABLE_UUID variable can be used to force using the device names for both GRUB and Linux.

---

Changes since v1 (suggested by Daniel Kiper):

- Explain better in the commit message why the GRUB_DISABLE_UUID variable is needed and the difference with the existing GRUB_DISABLE_LINUX_UUID/ GRUB_DISABLE_LINUX_PARTUUID variables.
- Remove logic that disabled setting the root cmdline param to either the filesystem UUID or partition UUID and instead use the existing variables to disable this.

 docs/grub.texi            |  9 +++++++++
 util/grub-mkconfig.in     | 10 ++++++++++
 util/grub-mkconfig_lib.in |  4 ++--
 3 files changed, 21 insertions(+), 2 deletions(-)
docs/grub.texi +9 -0
index 5ac61c09d1b..2fe0e1b83bb 100644
@@ -1441,6 +1441,15 @@ 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}. Setting this option to @samp{true}, will also set the options
+@samp{GRUB_DISABLE_LINUX_UUID} and @samp{GRUB_DISABLE_LINUX_PARTUUID} to
+@samp{true}, unless they have been explicilty set to @samp{false}.
+
 @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,
util/grub-mkconfig.in +10 -0
index a6ce375ed18..2537dbca2f9 100644
@@ -158,6 +158,15 @@ if test -f ${sysconfdir}/default/grub ; then
   . ${sysconfdir}/default/grub
 fi
 
+if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_UUID="true"
+  fi
+  if [ "x${GRUB_DISABLE_LINUX_PARTUUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_PARTUUID="true"
+  fi
+fi
+
 # XXX: should this be deprecated at some point?
 if [ "x${GRUB_TERMINAL}" != "x" ] ; then
   GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
@@ -227,6 +236,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 \
util/grub-mkconfig_lib.in +2 -2
index 0f801cab3e4..3e12b2c0e6a 100644
@@ -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'
Signature · 1 line
2.21.0
#1 lore raw

Adding Nicholas...

Quoted 25 lines · Javier Martinez Canillas

From: Peter Jones <[email protected]>

The grub-mkconfig and 10_linux scripts by default attempt to use a UUID to set the root kernel command line parameter and the $root GRUB environment variable.

The former can be disabled by setting the GRUB_DISABLE_LINUX_UUID variable to "true", but there is currently no way to disable the latter.

The generated grub config uses the search command with the --fs-uuid option to find the device that has to be set as $root, i.e:

search --no-floppy --fs-uuid --set=root ...

This is usually more reliable but in some cases it may not be appropriate, so this patch introduces a new GRUB_DISABLE_UUID variable that can be used to disable searching for the $root device by filesystem UUID.

When disabled, the $root device will be set to the value specified in the device.map as found by the grub-probe --target=compatibility_hint option.

When setting GRUB_DISABLE_UUID=true, the GRUB_DISABLE_LINUX_UUID and GRUB_DISABLE_LINUX_PARTUUID variables will also be set to "true" unless these have been explicitly set to "false".

Quoted 5 lines

That way, the GRUB_DISABLE_UUID variable can be used to force using the device names for both GRUB and Linux.

In general "Reviewed-by: Daniel Kiper <[email protected]>" but I would like to hear Nicholas opinions here too.

Daniel

Quoted 88 lines

---

Changes since v1 (suggested by Daniel Kiper):

- Explain better in the commit message why the GRUB_DISABLE_UUID variable is needed and the difference with the existing GRUB_DISABLE_LINUX_UUID/ GRUB_DISABLE_LINUX_PARTUUID variables.
- Remove logic that disabled setting the root cmdline param to either the filesystem UUID or partition UUID and instead use the existing variables to disable this.

 docs/grub.texi            |  9 +++++++++
 util/grub-mkconfig.in     | 10 ++++++++++
 util/grub-mkconfig_lib.in |  4 ++--
 3 files changed, 21 insertions(+), 2 deletions(-)
docs/grub.texi +9 -0
index 5ac61c09d1b..2fe0e1b83bb 100644
@@ -1441,6 +1441,15 @@ 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}. Setting this option to @samp{true}, will also set the options
+@samp{GRUB_DISABLE_LINUX_UUID} and @samp{GRUB_DISABLE_LINUX_PARTUUID} to
+@samp{true}, unless they have been explicilty set to @samp{false}.
+
 @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,
util/grub-mkconfig.in +10 -0
index a6ce375ed18..2537dbca2f9 100644
@@ -158,6 +158,15 @@ if test -f ${sysconfdir}/default/grub ; then
   . ${sysconfdir}/default/grub
 fi
 
+if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_UUID="true"
+  fi
+  if [ "x${GRUB_DISABLE_LINUX_PARTUUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_PARTUUID="true"
+  fi
+fi
+
 # XXX: should this be deprecated at some point?
 if [ "x${GRUB_TERMINAL}" != "x" ] ; then
   GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
@@ -227,6 +236,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 \
util/grub-mkconfig_lib.in +2 -3
index 0f801cab3e4..3e12b2c0e6a 100644
@@ -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'
--

2.21.0

#2 lore raw
Quoted 82 lines · Daniel Kiper

Adding Nicholas...

Quoted 25 lines · Javier Martinez Canillas

From: Peter Jones <[email protected]>

The grub-mkconfig and 10_linux scripts by default attempt to use a UUID to set the root kernel command line parameter and the $root GRUB environment variable.

The former can be disabled by setting the GRUB_DISABLE_LINUX_UUID variable to "true", but there is currently no way to disable the latter.

The generated grub config uses the search command with the --fs-uuid option to find the device that has to be set as $root, i.e:

search --no-floppy --fs-uuid --set=root ...

This is usually more reliable but in some cases it may not be appropriate, so this patch introduces a new GRUB_DISABLE_UUID variable that can be used to disable searching for the $root device by filesystem UUID.

When disabled, the $root device will be set to the value specified in the device.map as found by the grub-probe --target=compatibility_hint option.

When setting GRUB_DISABLE_UUID=true, the GRUB_DISABLE_LINUX_UUID and GRUB_DISABLE_LINUX_PARTUUID variables will also be set to "true" unless these have been explicitly set to "false".

Quoted 5 lines

That way, the GRUB_DISABLE_UUID variable can be used to force using the device names for both GRUB and Linux.

In general "Reviewed-by: Daniel Kiper <[email protected]>" but I would like to hear Nicholas opinions here too >
Daniel

Quoted 44 lines

---

Changes since v1 (suggested by Daniel Kiper):

- Explain better in the commit message why the GRUB_DISABLE_UUID variable is needed and the difference with the existing GRUB_DISABLE_LINUX_UUID/ GRUB_DISABLE_LINUX_PARTUUID variables.
- Remove logic that disabled setting the root cmdline param to either the filesystem UUID or partition UUID and instead use the existing variables to disable this.

  docs/grub.texi            |  9 +++++++++
  util/grub-mkconfig.in     | 10 ++++++++++
  util/grub-mkconfig_lib.in |  4 ++--
  3 files changed, 21 insertions(+), 2 deletions(-)
docs/grub.texi +9 -0
index 5ac61c09d1b..2fe0e1b83bb 100644
@@ -1441,6 +1441,15 @@ 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}. Setting this option to @samp{true}, will also set the options
+@samp{GRUB_DISABLE_LINUX_UUID} and @samp{GRUB_DISABLE_LINUX_PARTUUID} to
+@samp{true}, unless they have been explicilty set to @samp{false}.
+
  @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,
util/grub-mkconfig.in +0 -0
index a6ce375ed18..2537dbca2f9 100644
@@ -158,6 +158,15 @@ if test -f ${sysconfdir}/default/grub ; then
    . ${sysconfdir}/default/grub
  fi
 
Quoted 8 lines

util/grub-mkconfig.in if test -f ${sysconfdir}/default/grub ; then · line 168

Quoted 8 lines
util/grub-mkconfig.in +8 -0
+if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_UUID="true"
+  fi
+  if [ "x${GRUB_DISABLE_LINUX_PARTUUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_PARTUUID="true"
+  fi
+fi

I don't think this logic is exactly consistent with 51be3372ec8ba07ef68a409956ea0eefa89fe7c5. That commit assumes any value other than 'true' is false. It also sets the default values for GRUB_DISABLE_LINUX_PARTUUID in 10_linux.in and 20_linux_xen.in.

Both minor issues, but I do wonder if they should be addressed.

Thanks,
Nicholas Vinson

Quoted 36 lines
Quoted 36 lines
util/grub-mkconfig.in +2 -0
+
  # XXX: should this be deprecated at some point?
  if [ "x${GRUB_TERMINAL}" != "x" ] ; then
    GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
@@ -227,6 +236,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 \
util/grub-mkconfig_lib.in +2 -3
index 0f801cab3e4..3e12b2c0e6a 100644
@@ -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'
--

2.21.0

#3 lore raw

Hello Nicolas,

Thanks a lot for the feedback.

On 10/3/19 4:29 AM, Nicholas Vinson wrote:

[snip]

Quoted 13 lines
Quoted 9 lines

util/grub-mkconfig.in if test -f ${sysconfdir}/default/grub ; then · line 168

Quoted 9 lines
util/grub-mkconfig.in +8 -0
+if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_UUID="true"
+  fi
+  if [ "x${GRUB_DISABLE_LINUX_PARTUUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_PARTUUID="true"
+  fi
+fi

I don't think this logic is exactly consistent with 51be3372ec8ba07ef68a409956ea0eefa89fe7c5. That commit assumes any value other than 'true' is false. It also sets the default values for

I'm not sure how we could make it more consistent with the mentioned commit while only setting it to 'true' if the user haven't explicitly set the var as Dan asked in the previous version of the patch.

Quoted 2 lines

GRUB_DISABLE_LINUX_PARTUUID in 10_linux.in and 20_linux_xen.in.

This isn't an issue since that's only when GRUB_DISABLE_LINUX_PARTUUID hasn't been set, but it will be set to 'true' if GRUB_DISABLE_UUID=true.

Quoted 5 lines

Both minor issues, but I do wonder if they should be addressed.

Thanks,
Nicholas Vinson

Best regards,

Signature · 3 lines
Javier Martinez Canillas
Software Engineer - Desktop Hardware Enablement
Red Hat
#4 lore raw

Hello Daniel and Nicolas,

Quoted 22 lines · Javier Martinez Canillas

Hello Nicolas,

Thanks a lot for the feedback.

On 10/3/19 4:29 AM, Nicholas Vinson wrote:

[snip]

Quoted 13 lines
Quoted 9 lines

util/grub-mkconfig.in if test -f ${sysconfdir}/default/grub ; then · line 168

Quoted 9 lines
util/grub-mkconfig.in +8 -0
+if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_UUID="true"
+  fi
+  if [ "x${GRUB_DISABLE_LINUX_PARTUUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_PARTUUID="true"
+  fi
+fi

I don't think this logic is exactly consistent with 51be3372ec8ba07ef68a409956ea0eefa89fe7c5. That commit assumes any value other than 'true' is false. It also sets the default values for

Quoted 4 lines

I'm not sure how we could make it more consistent with the mentioned commit while only setting it to 'true' if the user haven't explicitly set the var as Dan asked in the previous version of the patch.

Any comments on this?

Quoted 6 lines
Quoted 2 lines

GRUB_DISABLE_LINUX_PARTUUID in 10_linux.in and 20_linux_xen.in.

This isn't an issue since that's only when GRUB_DISABLE_LINUX_PARTUUID hasn't been set, but it will be set to 'true' if GRUB_DISABLE_UUID=true.

Quoted 8 lines
Quoted 5 lines

Both minor issues, but I do wonder if they should be addressed.

Thanks,
Nicholas Vinson

Best regards,

Best regards,

Signature · 3 lines
Javier Martinez Canillas
Software Engineer - Desktop Hardware Enablement
Red Hat
#5 lore raw
In reply to Javier Martinez Canillas
Quoted 22 lines · Javier Martinez Canillas

Hello Nicolas,

Thanks a lot for the feedback.

On 10/3/19 4:29 AM, Nicholas Vinson wrote:

[snip]

Quoted 13 lines
Quoted 9 lines

util/grub-mkconfig.in if test -f ${sysconfdir}/default/grub ; then · line 168

Quoted 9 lines
util/grub-mkconfig.in +8 -0
+if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_UUID="true"
+  fi
+  if [ "x${GRUB_DISABLE_LINUX_PARTUUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_PARTUUID="true"
+  fi
+fi

I don't think this logic is exactly consistent with 51be3372ec8ba07ef68a409956ea0eefa89fe7c5. That commit assumes any value other than 'true' is false. It also sets the default values for

Quoted 3 lines

I'm not sure how we could make it more consistent with the mentioned commit while only setting it to 'true' if the user haven't explicitly set the var as Dan asked in the previous version of the patch.

It seems to me that it can be easily fixed, e.g.:

if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
GRUB_DISABLE_LINUX_UUID="true"
fi

Same for GRUB_DISABLE_LINUX_PARTUUID.

Does it make sense?

Daniel

#6 lore raw

Hello Daniel,

Quoted 29 lines · Daniel Kiper
Quoted 22 lines · Javier Martinez Canillas

Hello Nicolas,

Thanks a lot for the feedback.

On 10/3/19 4:29 AM, Nicholas Vinson wrote:

[snip]

Quoted 13 lines
Quoted 9 lines

util/grub-mkconfig.in if test -f ${sysconfdir}/default/grub ; then · line 168

Quoted 9 lines
util/grub-mkconfig.in +8 -0
+if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_UUID="true"
+  fi
+  if [ "x${GRUB_DISABLE_LINUX_PARTUUID}" != "xfalse" ]; then
+    GRUB_DISABLE_LINUX_PARTUUID="true"
+  fi
+fi

I don't think this logic is exactly consistent with 51be3372ec8ba07ef68a409956ea0eefa89fe7c5. That commit assumes any value other than 'true' is false. It also sets the default values for

Quoted 3 lines

I'm not sure how we could make it more consistent with the mentioned commit while only setting it to 'true' if the user haven't explicitly set the var as Dan asked in the previous version of the patch.

It seems to me that it can be easily fixed, e.g.:

Quoted 8 lines

if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
GRUB_DISABLE_LINUX_UUID="true"
fi

Same for GRUB_DISABLE_LINUX_PARTUUID.

Does it make sense?

Right, that makes sense. Thanks.

Quoted 2 lines

Daniel

Best regards,

Signature · 3 lines
Javier Martinez Canillas
Software Engineer - Desktop Hardware Enablement
Red Hat