* [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE
@ 2016-03-05 22:30 Mike Gilbert
2016-03-06 5:52 ` Andrei Borzenkov
0 siblings, 1 reply; 2+ messages in thread
From: Mike Gilbert @ 2016-03-05 22:30 UTC (permalink / raw)
To: grub-devel
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 5a78513..de9044c 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.7.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE
2016-03-05 22:30 [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE Mike Gilbert
@ 2016-03-06 5:52 ` Andrei Borzenkov
0 siblings, 0 replies; 2+ messages in thread
From: Andrei Borzenkov @ 2016-03-06 5:52 UTC (permalink / raw)
To: grub-devel
06.03.2016 01:30, Mike Gilbert пишет:
> Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
> mixing of || and && operators. Add some parens to help with that.
Applied. Thanks!
> ---
> 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 5a78513..de9044c 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}
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-06 5:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-05 22:30 [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE Mike Gilbert
2016-03-06 5:52 ` Andrei Borzenkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).