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}
>
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
