mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
|
From 082bc9f77b200eb48a5f1147163dea9c9d02d44c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mike Gilbert <floppym@gentoo.org>
|
||
|
|
Date: Sat, 5 Mar 2016 17:30:48 -0500
|
||
|
|
Subject: [PATCH 002/123] 10_linux: Fix grouping of tests for GRUB_DEVICE
|
||
|
|
|
||
|
|
Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
|
||
|
|
mixing of || and && operators. Add some parens to help with that.
|
||
|
|
---
|
||
|
|
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 5a78513ae..de9044c7f 100644
|
||
|
|
--- a/util/grub.d/10_linux.in
|
||
|
|
+++ b/util/grub.d/10_linux.in
|
||
|
|
@@ -47,7 +47,7 @@ esac
|
||
|
|
# 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}" \
|
||
|
|
- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
|
||
|
|
+ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
|
||
|
|
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
||
|
|
else
|
||
|
|
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
||
|
|
--
|
||
|
|
2.14.3
|
||
|
|
|