From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VNmxw-0001BX-Il for mharc-grub-devel@gnu.org; Sun, 22 Sep 2013 12:57:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNmxn-0001BH-5l for grub-devel@gnu.org; Sun, 22 Sep 2013 12:56:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VNmxe-0004Cm-Mf for grub-devel@gnu.org; Sun, 22 Sep 2013 12:56:51 -0400 Received: from mail-ee0-x229.google.com ([2a00:1450:4013:c00::229]:48531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNmxe-0004Ch-Ex for grub-devel@gnu.org; Sun, 22 Sep 2013 12:56:42 -0400 Received: by mail-ee0-f41.google.com with SMTP id d17so1249986eek.14 for ; Sun, 22 Sep 2013 09:56:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=/B0KVjC3TdfSJwUHjDKiEMuy1+BS47hhUxHl/dupVEY=; b=FU6pKp3erKvy+iAl8ORJ94JMT7lbLsN5bimQ3EFWEnSmpIdfpsT9uv90VRj5nfKO1q hj6sz13LMdgMm9F+Tmv7tCdRxbLXkr7jHstO0/kdMou6z9kzg8gmIUcTtE7Z578OcWPn IyYvvWqcRWiNJFh2Lzb1scSyYX5eMa+Fw+Q2a25XVF1V4BP1MbDEj17Puf3Ho7WyIhS5 qiB3GMpngkwLF4KzS5F7lbUx15v2IsEhT6w2DrP/qAd91O6n3FRWlj/eU6Q+uq8rHE6h V96Gi86RBAnpXu+6Xag3uoDgIUpWDrcDFJe3wgHKip1qQroCcSWBLmuwtHeX+Iz5rAr/ NZCw== X-Received: by 10.14.198.197 with SMTP id v45mr5140307een.52.1379869001015; Sun, 22 Sep 2013 09:56:41 -0700 (PDT) Received: from [192.168.1.113] (31-249.1-85.cust.bluewin.ch. [85.1.249.31]) by mx.google.com with ESMTPSA id x47sm35474889eea.16.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 22 Sep 2013 09:56:40 -0700 (PDT) Message-ID: <523F2146.8050204@gmail.com> Date: Sun, 22 Sep 2013 18:56:38 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130821 Icedove/17.0.8 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] LVM UUID grub-probe fix and documentation update References: <1379866868-15811-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1379866868-15811-1-git-send-email-arvidjaar@gmail.com> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="----enig2UKDNAGCNFFCHJPWIXWBA" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::229 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, 22 Sep 2013 16:56:59 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2UKDNAGCNFFCHJPWIXWBA Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Go ahead. On 22.09.2013 18:21, Andrey Borzenkov wrote: > 1. Update documentation to mention it. Also fix docs (lv =3D> lvm). > 2. Fix grub-probe -t abstraction not returning anything for LVM - as it= now > prefers LVM UUID based devices, also check for correct name. >=20 >=20 > Signed-off-by: Andrey Borzenkov >=20 > --- > docs/grub.texi | 8 +++++--- > util/grub-probe.c | 3 ++- > 2 files changed, 7 insertions(+), 4 deletions(-) >=20 > diff --git a/docs/grub.texi b/docs/grub.texi > index 894b97f..574f602 100644 > --- a/docs/grub.texi > +++ b/docs/grub.texi > @@ -2484,7 +2484,7 @@ by a digit, like @samp{fd0}, or @samp{cd}. > AHCI, PATA (ata), crypto, USB use the name of driver followed by a num= ber. > Memdisk and host are limited to one disk and so it's refered just by d= river > name. > -RAID (md), ofdisk (ieee1275 and nand), LVM (lv), LDM and arcdisk (arc)= use > +RAID (md), ofdisk (ieee1275 and nand), LVM (lvm), LDM and arcdisk (arc= ) use > intrinsic name of disk prefixed by driver name. Additionally just ``na= nd'' > refers to the disk aliased as ``nand''. > Conflicts are solved by suffixing a number if necessarry. > @@ -2493,7 +2493,8 @@ Loopback uses whatever name specified to @command= {loopback} command. > Hostdisk uses names specified in device.map as long as it's of the for= m > [fhc]d[0-9]* or hostdisk/. > For crypto and RAID (md) additionally you can use the syntax > -uuid/. > +uuid/. For LVM additionally you can use the syntax= > +lvmid//. > =20 > @example > (fd0) > @@ -2505,7 +2506,8 @@ For crypto and RAID (md) additionally you can use= the syntax > (usb0) > (cryptouuid/123456789abcdef0123456789abcdef0) > (mduuid/123456789abcdef0123456789abcdef0) > -(lv/system-root) > +(lvm/system-root) > +(lvmid/F1ikgD-2RES-306G-il9M-7iwa-4NKW-EbV1NV/eLGuCQ-L4Ka-XUgR-sjtJ-ff= ch-bajr-fCNfz5) > (md/myraid) > (md/0) > (ieee1275/disk2) > diff --git a/util/grub-probe.c b/util/grub-probe.c > index a46f0b1..0978e0a 100644 > --- a/util/grub-probe.c > +++ b/util/grub-probe.c > @@ -292,7 +292,8 @@ probe_abstraction (grub_disk_t disk) > } > =20 > if (disk->dev->id =3D=3D GRUB_DISK_DEVICE_DISKFILTER_ID > - && grub_memcmp (disk->name, "lvm/", sizeof ("lvm/") - 1) =3D=3D = 0) > + && (grub_memcmp (disk->name, "lvm/", sizeof ("lvm/") - 1) =3D=3D= 0 || > + grub_memcmp (disk->name, "lvmid/", sizeof ("lvmid/") - 1) =3D=3D 0)= ) > printf ("lvm "); > =20 > if (disk->dev->id =3D=3D GRUB_DISK_DEVICE_DISKFILTER_ID >=20 ------enig2UKDNAGCNFFCHJPWIXWBA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iF4EAREKAAYFAlI/IUYACgkQNak7dOguQgmTCgD9HSiFMtz7Mn/BW0Cai0SW1A6S k2rskDchetsy9HxI0QQA/0bvkxl8W9G1poMIWDkXAltUHTiVbKRvcwDXOwtDYWPq =kiWh -----END PGP SIGNATURE----- ------enig2UKDNAGCNFFCHJPWIXWBA--