Attachment 8207 Details for Bug 18780 – proposed patch

[patch] proposed patch

grub2-2.00-mga-dont_check_uuid_in_installer.patch (text/plain), 905 bytes, created by Barry Jackson on 2016-07-18 19:04:13 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2016-07-18 19:04:13 CEST

Size: 905 bytes

patch

obsolete

diff -ur grub-2.02~beta3_o/util/grub.d/10_linux.in grub-2.02~beta3_n/util/grub.d/10_linux.in
--- grub-2.02~beta3_o/util/grub.d/10_linux.in	2016-07-18 17:44:44.857108348 +0100
+++ grub-2.02~beta3_n/util/grub.d/10_linux.in	2016-07-18 17:43:18.184891235 +0100
@@ -46,8 +46,8 @@
 
 # btrfs may reside on multiple devices. We cannot pass them as value of root= parameter
 # and mounting btrfs requires user space scanning, so force UUID in this case.
-if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+if  [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+    || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" && [ "x${DURING_INSTALL}" == "x1" ] ) \
     || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else

Actions: View | Diff

Attachments on bug 18780: 8084 | 8195 | 8196 | 8197 | 8198 | 8207 | 8213