vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

10_linux: Fix grouping of tests for GRUB_DEVICE

Browse source 
Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
mixing of || and && operators. Add some parens to help with that.
This commit is contained in:
Mike Gilbert 2016-03-05 17:30:48 -05:00 committed by Andrei Borzenkov
parent d017ea8ede
commit 082bc9f77b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
util/grub.d/10_linux.in
View file

@ -47,7 +47,7 @@ esac
# and mounting btrfs requires user space scanning, so force UUID in this case. # 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" ] \ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ || ! 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} LINUX_ROOT_DEVICE=${GRUB_DEVICE}
else else
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}