From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1f3yCD-0001Nj-Uq for mharc-grub-devel@gnu.org; Thu, 05 Apr 2018 02:16:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3yCA-0001NB-AJ for grub-devel@gnu.org; Thu, 05 Apr 2018 02:16:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3yC8-0004ML-VZ for grub-devel@gnu.org; Thu, 05 Apr 2018 02:16:26 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:44106) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f3yC8-0004Lz-IM for grub-devel@gnu.org; Thu, 05 Apr 2018 02:16:24 -0400 Received: by mail-pl0-x243.google.com with SMTP id b6-v6so15771702pla.11 for ; Wed, 04 Apr 2018 23:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to; bh=qmin8YnYYSbewB77E3+925VoDbGmaPf/tE9r2Q8HmwI=; b=jX9udqZG0kpsNTYxZqnbPkpOCyYs4L9E9SFd4agmR1BdV+a5QW18gg8gFToTFLWuKT OaFqdBbB2O7v2QvweQKqnFOeomvgBZ18ptTIEAkPdXLEBqSFN1XJOyWEuRjDTxNU+sR7 V8UhsVlsnf27RU0JdZOqai9/5ris7nP2MSx7pEZoWqRKGh9tDoEiA1VydfDfvlcfTOAN d5HKKpl3YDjMpxT1GKoagCghIFt7XsJ0PnbaByM3HV5eyXOAW31XUt7eGTpjONsQUHKe 5Pk8NKk8+aHJqR5eM91uodhpX839OZLAOE68KkchVTlzkzD7gZAtqQocksZB25EAzQ5C 1DFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to; bh=qmin8YnYYSbewB77E3+925VoDbGmaPf/tE9r2Q8HmwI=; b=YXt4pI8+bVSPRVjuq0/N/jeJmnA2Td9c3YQAI6SnM198CujObuyojqU7wvZQoofZgt kqHGjoKv06r/R6iN21EkVkzLFsZgbiDES1H0RmenJ/rxa+en8HMivMzRKZdL+Cd2OZmm UF91YSbrWiRvtBR+Q1TvPBo4EeffKBt9JXFsjW3U4U3UJ0OFMb68RnsHCbgGAb1tEl92 ugaPg5mlwAWEVVqNEd80gM+nBNc+/A/MAZ8CETzD+FYG7zEcSyFTKVXcOENecUf0sX6a QjyczSJrGdfLF/Azu/zZF5nPCSrVjpzL8EqkqG+Eyfg/JV+aDQMpYs9rgT7hoZanz6Ys CXUA== X-Gm-Message-State: AElRT7FUBYZ8b8Ek7f384pN6W2lau7ECKjihWk6BMjWs+Ajzbzci0ZPE fWcUMx0HX8P0XHE58EPLszecVA== X-Google-Smtp-Source: AIpwx4/FuKVhc7oKxEbW+rxNtkg1K4vRgp6adBBWmUV9NRIprdBWmeiO2W6J8F0G7Y8U2zJ5xCMJIw== X-Received: by 2002:a17:902:7888:: with SMTP id q8-v6mr21539566pll.108.1522908982457; Wed, 04 Apr 2018 23:16:22 -0700 (PDT) Received: from ?IPv6:2601:602:9c01:e86a:2ec2:3a19:cd81:76ab? ([2601:602:9c01:e86a:2ec2:3a19:cd81:76ab]) by smtp.googlemail.com with ESMTPSA id 6sm11154238pgf.9.2018.04.04.23.16.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 23:16:21 -0700 (PDT) Subject: Re: [GRUB PARTUUID PATCH V8 4/4] Update grub script template files To: Daniel Kiper Cc: grub-devel@gnu.org References: <20180404202316.GB1721@router-fw-old.local.net-space.pl> From: Nick Vinson Openpgp: preference=signencrypt Autocrypt: addr=nvinson234@gmail.com; keydata= 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 xHE= Message-ID: <1b2c5289-5f6e-349b-0ecc-7bcc6e71ee4a@gmail.com> Date: Wed, 4 Apr 2018 23:16:09 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180404202316.GB1721@router-fw-old.local.net-space.pl> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Ci7nsmnjnQeN1jTV3Os6YQWZdl5AT1GDB" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::243 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Apr 2018 06:16:28 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Ci7nsmnjnQeN1jTV3Os6YQWZdl5AT1GDB Content-Type: multipart/mixed; boundary="2pIylpVk3p4uuVtQQ2q7xuvz8brErVYtA"; protected-headers="v1" From: Nick Vinson To: Daniel Kiper Cc: grub-devel@gnu.org Message-ID: <1b2c5289-5f6e-349b-0ecc-7bcc6e71ee4a@gmail.com> Subject: Re: [GRUB PARTUUID PATCH V8 4/4] Update grub script template files References: <20180404202316.GB1721@router-fw-old.local.net-space.pl> In-Reply-To: <20180404202316.GB1721@router-fw-old.local.net-space.pl> --2pIylpVk3p4uuVtQQ2q7xuvz8brErVYtA Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 04/04/2018 01:23 PM, Daniel Kiper wrote: > On Wed, Mar 28, 2018 at 08:32:54AM -0700, Nicholas Vinson wrote: >> Update grub-mkconfig.in and 10_linux.in to support grub-probe's new >> partuuid target. Update grub.texi documenation. >> >> Signed-off-by: Nicholas Vinson >> --- >> docs/grub.texi | 9 +++++++++ >> util/grub-mkconfig.in | 3 +++ >> util/grub.d/10_linux.in | 12 +++++++++--- >> 3 files changed, 21 insertions(+), 3 deletions(-) >> >> diff --git a/docs/grub.texi b/docs/grub.texi >> index 65b4bbeda..019ce5d03 100644 >> --- a/docs/grub.texi >> +++ b/docs/grub.texi >> @@ -1424,6 +1424,15 @@ the Linux kernel, using a @samp{root=3DUUID=3D.= =2E.} kernel parameter. This is >> usually more reliable, but in some cases it may not be appropriate. = To >> disable the use of UUIDs, set this option to @samp{true}. >> >> +@item GRUB_ENABLE_LINUX_PARTUUID >> +Setting this option to @samp{true} changes the behavior of >> +@command{grub-mkconfig} so that it identifies the device containing t= he root >> +filesystem by the partition UUID via the @samp{root=3DPARTUUID=3D...}= kernel >> +parameter. This is desirable for Linux systems where identifying the= root >> +filesystem by its filesystem UUID or device name is inappropriate. H= owever, >> +this option is only supported in Linux kernel versions 2.6.37 (3.10 f= or systems >> +using the MSDOS partition scheme) or newer. >> + >> @item GRUB_DISABLE_RECOVERY >> If this option is set to @samp{true}, disable the generation of recov= ery >> mode menu entries. >> diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in >> index 35ef583b0..9a1f92bdf 100644 >> --- a/util/grub-mkconfig.in >> +++ b/util/grub-mkconfig.in >> @@ -134,6 +134,7 @@ fi >> # Device containing our userland. Typically used for root=3D paramet= er. >> GRUB_DEVICE=3D"`${grub_probe} --target=3Ddevice /`" >> GRUB_DEVICE_UUID=3D"`${grub_probe} --device ${GRUB_DEVICE} --target=3D= fs_uuid 2> /dev/null`" || true >> +GRUB_DEVICE_PARTUUID=3D"`${grub_probe} --device ${GRUB_DEVICE} --targ= et=3Dpartuuid 2> /dev/null`" || true >> >> # Device containing our /boot partition. Usually the same as GRUB_DE= VICE. >> GRUB_DEVICE_BOOT=3D"`${grub_probe} --target=3Ddevice /boot`" >> @@ -188,6 +189,7 @@ if [ "x${GRUB_ACTUAL_DEFAULT}" =3D "xsaved" ] ; th= en GRUB_ACTUAL_DEFAULT=3D"`"${grub >> # override them. >> export GRUB_DEVICE \ >> GRUB_DEVICE_UUID \ >> + GRUB_DEVICE_PARTUUID \ >> GRUB_DEVICE_BOOT \ >> GRUB_DEVICE_BOOT_UUID \ >> GRUB_FS \ >> @@ -223,6 +225,7 @@ export GRUB_DEFAULT \ >> GRUB_TERMINAL_OUTPUT \ >> GRUB_SERIAL_COMMAND \ >> GRUB_DISABLE_LINUX_UUID \ >> + GRUB_ENABLE_LINUX_PARTUUID \ >> GRUB_DISABLE_RECOVERY \ >> GRUB_VIDEO_BACKEND \ >> GRUB_GFXMODE \ >> diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in >> index faedf74e1..53de33bea 100644 >> --- a/util/grub.d/10_linux.in >> +++ b/util/grub.d/10_linux.in >> @@ -45,12 +45,18 @@ esac >> >> # btrfs may reside on multiple devices. We cannot pass them as value = of root=3D parameter >> # and mounting btrfs requires user space scanning, so force UUID in t= his case. >> -if [ "x${GRUB_DEVICE_UUID}" =3D "x" ] || [ "x${GRUB_DISABLE_LINUX_UUI= D}" =3D "xtrue" ] \ >> - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ >> +if [ "x${GRUB_DEVICE_UUID}" =3D "x" ] && [ "x${GRUB_DEVICE_PARTUUID}"= =3D "x" ] \ >> + || [ "x${GRUB_DISABLE_LINUX_UUID}" =3D "xtrue" ] \ >=20 > Hmmm... Have you tested this patch with GRUB_DISABLE_LINUX_UUID=3Dtrue = and > GRUB_ENABLE_LINUX_PARTUUID=3Dtrue? I do not think so. LINUX_ROOT_DEVICE= will > be set to ${GRUB_DEVICE}. I have a feeling that this is not what you ex= pect. The idea was for GRUB_DISABLE_LINUX_UUID to act as a controlling variable with this setup. I reviewed the description for the variable, and having it act that way doesn't make sense. I will rewrite this part and make sure the two variables act as independently as possible. The one exception, however, would be when GRUB_DISABLE_LINUX_UUID is unset and GRUB_ENABLE_LINUX_PARTUUID is set. In such a case, I'll have the code favor the fs UUID over the partition UUID. I think this would cause the least amount of surprise since the initramfs images I've seen prefer the fs UUID. >=20 > Additionally, what will happen if GRUB_DISABLE_LINUX_UUID=3Dtrue and > GRUB_ENABLE_LINUX_PARTUUID=3Dfalse? Well, this should work right now > but please test it after fixing above mentioned issue. It should favor the Linux device name. I'll make sure that behavior is preserved. >=20 > Should not we do s/GRUB_ENABLE_LINUX_PARTUUID/GRUB_DISABLE_LINUX_PARTUU= ID/? > Then the variable will have similar meaning to GRUB_DISABLE_LINUX_UUID.= > Hence, all will be less confusing. I can return the name to GRUB_DISABLE_LINUX_PARTUUID. When I originally used that name, there was concerns about maintaining compatibility with older kernel versions. However, I think I can use the name GRUB_DISABLE_LINUX_PARTUUID while maintaining that compatibility. Thanks, Nicholas Vinson >=20 >> + || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ >> + && ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" = ) \ >> || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}= " lvm ); then >> LINUX_ROOT_DEVICE=3D${GRUB_DEVICE} >> -else >> +elif [ "x${GRUB_ENABLE_LINUX_PARTUUID}" !=3D "xtrue" ] \ >> + || [ "x${GRUB_DEVICE_PARTUUID}" =3D "x" ] \ >> + || ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}"; the= n >> LINUX_ROOT_DEVICE=3DUUID=3D${GRUB_DEVICE_UUID} >> +else >> + LINUX_ROOT_DEVICE=3DPARTUUID=3D${GRUB_DEVICE_PARTUUID} >> fi >=20 > Daniel >=20 --2pIylpVk3p4uuVtQQ2q7xuvz8brErVYtA-- --Ci7nsmnjnQeN1jTV3Os6YQWZdl5AT1GDB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE18QFYzlwGKI8bhHQAGpoeGzkaOIFAlrFvy0ACgkQAGpoeGzk aOKD/RAA2HQ5P92JqxLZBKu7LAHxaw8Qg9Z0Aq1f+upoNDy1kJ+210cMFaT1AsdB dEwhZC+cJLzaXiDE6wZsUo7XYWkCjcbitjBN9F+GbNOcVfTJdDMNyAO7bZyLPK+E XZCTY6dPYZwxpadXHZQow4Bo8K2KNAb/xuEyie33Tr9FZ3uzBNFrKpPzGtWpcHQH m3dvDpLKFCL8BZgombBqf//H6cvZ7XP8s2jkurdhjFAnOnlRC2KJ/7GYl68oLS+a Yu8zvc3y7dRKz0R0TE4f4JDpoDZhmWhufamS6FYKGcx3XLeISPT6T189tSqHx0f8 By9S8dTMdCF/KESLHibAW7Q5xK94en5VeG7/3ItdQRSbQDHoUSGjt6f6l7aLg/im Veaul5MWyeJTpN4DKmNWmE7BUHFCLyxUkk/pXl5VGZsLPkhWLn5pdN2k7L5IsKia xxdWhGZMqGHFzyj2IDW9DetNTPVL80wIsLiSVCQNKtxqWf3vj2v/hguOc/c4/TVt MaVYTBfQMXXZuxyJGIFyLOCNyonf+o4fsH1jOn38fLwxz6Q8a6yIh5uqd/2EqR85 /9ob74Rs4tyKZInbKZC2E07t87UrUbNhYGJKs53+5xc0JbTA7x1A+0QPjb6WCeHa cAO0O6ch/pEZorukdPLS3BZAOwhBaLLmllqSkF2RDZorNg269Dg= =Rk+O -----END PGP SIGNATURE----- --Ci7nsmnjnQeN1jTV3Os6YQWZdl5AT1GDB--