2018-07-12 14:56:34 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-07-10 19:08:14 +00:00
|
|
|
From: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
|
Date: Tue, 5 Jun 2018 13:04:04 +0200
|
|
|
|
|
Subject: [PATCH] templates: Add missing "]"
|
|
|
|
|
|
|
|
|
|
Commit 51be337 (templates: Update grub script template files)
|
|
|
|
|
lacked one "]", so, add it.
|
|
|
|
|
|
|
|
|
|
Reported-by: Philip <philm@manjaro.org>
|
|
|
|
|
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
|
---
|
|
|
|
|
util/grub.d/10_linux.in | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
|
|
index 146499f22fd..61ebd7dc714 100644
|
|
|
|
|
--- a/util/grub.d/10_linux.in
|
|
|
|
|
+++ b/util/grub.d/10_linux.in
|
|
|
|
|
@@ -49,7 +49,7 @@ GRUB_DISABLE_LINUX_PARTUUID=${GRUB_DISABLE_LINUX_PARTUUID-true}
|
|
|
|
|
|
|
|
|
|
# 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_DEVICE_PARTUUID}" = "x" ) \
|
|
|
|
|
+if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \
|
|
|
|
|
|| ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|
|
|
|
|
&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
|
|
|
|
|
|| ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
|
