From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1acRbw-0003rk-42 for mharc-grub-devel@gnu.org; Sun, 06 Mar 2016 00:52:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acRbu-0003pV-03 for grub-devel@gnu.org; Sun, 06 Mar 2016 00:52:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acRbo-0005Be-FH for grub-devel@gnu.org; Sun, 06 Mar 2016 00:52:09 -0500 Received: from mail-lb0-x232.google.com ([2a00:1450:4010:c04::232]:34345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acRbo-0005Ba-6a for grub-devel@gnu.org; Sun, 06 Mar 2016 00:52:04 -0500 Received: by mail-lb0-x232.google.com with SMTP id xr8so3247000lbb.1 for ; Sat, 05 Mar 2016 21:52:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=sjKvJ2UXfxzHCJ/i0w/FusAauAEnxM5Cldnpe87T4kA=; b=OXqngxPQku8zWj8dZOLGikwGHZDRf86V2faZpfsUQF2Lc3rmQieLsRu1OBFpP9f5HC gIOY5cXYX6kauJjib4clACst4iseEqhOy5pWsr6B9oHcdqDzNfMSBszeDJAiMTCMKwM1 UWQ6PvRMuGWIZccoizYu5SWcXENRuz0j4RZzs7eUGSO4P7uIJ7/CRwd5QwX5/yux6xw6 GV4wMmuKGuCaF4XQetNnCKO7DU+IWUOuiDbjwRJf6R5EwfubMgp1XN0lvAKz3jukoqtE WIsyj8+rqV4AtaAJtOoBskI4D22QQwko6UKga9hMKxtwWK3bhqSlWlDVaRsQ+6jdXWvr 4UUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=sjKvJ2UXfxzHCJ/i0w/FusAauAEnxM5Cldnpe87T4kA=; b=MvZW0MmxQQc8wRXZtzeD2iR7TK6Wy8Wl2MDRyHIBo9ylGv0zUSx11PCWCr5jWiFRvZ UTLivx/NqHtihKTMexRHlSCWHfypUpjAZUHwoV4giaNWgPSSsA5nS/J/srIKruMyik7V oZSE5aLYQD+w2fQkitjDnkmZZFGShbUoeCMxKZVwcIazJESy/jNIQFGWIZthBhIsNyGK BlbZU19HBBbfVJ5EhSagcs57DHwnI2X+l2AnZVIxjXNMB1K8+mNmHn2R3G8YjfyYysF6 lHmouSa2kAbB7AzhcxeqcmqqlWCn+1FDD2vekq+qhApmoPQ1sHEeHfxL56W1fNsdSkDq Gqcg== X-Gm-Message-State: AD7BkJKxXOQSNwRmRLvC//ocbITLfzhocqexk6Gj687Y9RG/gIT5i3Ds/JGKlcmEP92WAQ== X-Received: by 10.112.150.165 with SMTP id uj5mr616727lbb.95.1457243523379; Sat, 05 Mar 2016 21:52:03 -0800 (PST) Received: from [192.168.1.41] (ppp109-252-76-159.pppoe.spdop.ru. [109.252.76.159]) by smtp.gmail.com with ESMTPSA id m64sm1809860lfd.36.2016.03.05.21.52.02 for (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Mar 2016 21:52:02 -0800 (PST) Subject: Re: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE To: grub-devel@gnu.org References: <1457217048-30656-1-git-send-email-floppym@gentoo.org> From: Andrei Borzenkov Message-ID: <56DBC581.3000304@gmail.com> Date: Sun, 6 Mar 2016 08:52:01 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1457217048-30656-1-git-send-email-floppym@gentoo.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::232 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2016 05:52:10 -0000 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} >