From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 5 Mar 2016 22:30:48 +0000 (-0500)
Subject: 10_linux: Fix grouping of tests for GRUB_DEVICE
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=19e4a51ac15ce912d9229aada26ec154e0112781;p=grub2.git

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.

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=082bc9f77b200eb48a5f1147163dea9c9d02d44c
Bug-Debian: https://bugs.debian.org/841680
Bug-Debian: https://bugs.debian.org/841741
Last-Update: 2016-10-31

Patch-Name: uuid-test-precedence-1.patch
---

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index fd9dc1a21..f7de2e1c5 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -65,7 +65,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}