From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1S1v4K-00079Q-Ql for mharc-grub-devel@gnu.org; Mon, 27 Feb 2012 02:32:24 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1v4F-00079E-Om for grub-devel@gnu.org; Mon, 27 Feb 2012 02:32:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S1v4E-00024y-BM for grub-devel@gnu.org; Mon, 27 Feb 2012 02:32:19 -0500 Received: from spam1.wiktel.com ([69.89.207.151]:36811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1v4E-00024u-4y for grub-devel@gnu.org; Mon, 27 Feb 2012 02:32:18 -0500 Received: from [172.16.7.82] ([66.135.231.130]) (authenticated bits=0) by spam1.wiktel.com (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id q1R7WEmR031075; Mon, 27 Feb 2012 01:32:14 -0600 Subject: Re: Freeze on 27 February From: Richard Laager To: Vladimir =?UTF-8?Q?=27=CF=86-coder/phcoder=27?= Serbinenko In-Reply-To: <4F45DDF0.2090908@gmail.com> References: <4F43C25C.2040106@gmail.com> <1329888906.16648.134.camel@watermelon.coderich.net> <4F45DDF0.2090908@gmail.com> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-watBT3kr8ZG4netXVlyC" Date: Mon, 27 Feb 2012 01:32:13 -0600 Message-ID: <1330327933.2901.32.camel@watermelon.coderich.net> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-bounce-key: wiktel.com-1; rlaager@wiktel.com; 1330327935; qUJGq4RUkUXlxX9QJ09vEoBlnH0; X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 69.89.207.151 Cc: The development of GRUB 2 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: Mon, 27 Feb 2012 07:32:23 -0000 --=-watBT3kr8ZG4netXVlyC Content-Type: multipart/mixed; boundary="=-o8Qb0A9yMkapaa+8UuNt" --=-o8Qb0A9yMkapaa+8UuNt Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2012-02-23 at 07:34 +0100, Vladimir '=CF=86-coder/phcoder' Serbinen= ko wrote: > > Index: grub/util/getroot.c > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > --- grub.orig/util/getroot.c 2012-02-03 05:22:36.227364000 -0600 > > +++ grub/util/getroot.c 2012-02-03 05:22:41.255135000 -0600 > > @@ -301,7 +301,10 @@ > > devices =3D xrealloc (devices, sizeof (devices[0]) > > * devices_allocated); > > } > > - devices[ndevices++] =3D xasprintf ("/dev/%s", name); > > + if (name[0] =3D=3D '/') > > + devices[ndevices++] =3D xstrdup (name); > > + else > > + devices[ndevices++] =3D xasprintf ("/dev/%s", name); > > } > > break; > > } > > > This one is ok other than the missing ChangeLog. Updated zfs-devices.patch attached > @@ -478,7 +558,8 @@ > if (!*entries[i].device) > continue; >=20 > - if (grub_strcmp (entries[i].fstype, "fuse.zfs") =3D=3D 0) > + if (grub_strcmp (entries[i].fstype, "fuse.zfs") =3D=3D 0 || > + grub_strcmp (entries[i].fstype, "zfs") =3D=3D 0) > { > char *slash; > slash =3D strchr (entries[i].device, '/'); > This should go as a separate patch Attached as zfs-fstype.patch. --=20 Richard --=-o8Qb0A9yMkapaa+8UuNt Content-Disposition: attachment; filename="zfs-devices.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="zfs-devices.patch"; charset="UTF-8" SW5kZXg6IGdydWIvdXRpbC9nZXRyb290LmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBncnViLm9yaWcvdXRp bC9nZXRyb290LmMJMjAxMi0wMi0yNyAwMTowOTo1OC4xNDI2MTQ4MjkgLTA2MDANCisrKyBncnVi L3V0aWwvZ2V0cm9vdC5jCTIwMTItMDItMjcgMDE6MTA6MDcuMjM3MzQ0MDAwIC0wNjAwDQpAQCAt MzAyLDcgKzMwMiwxMCBAQCBmaW5kX3Jvb3RfZGV2aWNlc19mcm9tX3Bvb2xuYW1lIChjaGFyICpw DQogCQkgICAgZGV2aWNlcyA9IHhyZWFsbG9jIChkZXZpY2VzLCBzaXplb2YgKGRldmljZXNbMF0p DQogCQkJCQkqIGRldmljZXNfYWxsb2NhdGVkKTsNCiAJCSAgfQ0KLQkJZGV2aWNlc1tuZGV2aWNl cysrXSA9IHhhc3ByaW50ZiAoIi9kZXYvJXMiLCBuYW1lKTsNCisJCWlmIChuYW1lWzBdID09ICcv JykNCisJCSAgZGV2aWNlc1tuZGV2aWNlcysrXSA9IHhzdHJkdXAgKG5hbWUpOw0KKwkJZWxzZQ0K KwkJICBkZXZpY2VzW25kZXZpY2VzKytdID0geGFzcHJpbnRmICgiL2Rldi8lcyIsIG5hbWUpOw0K IAkgICAgICB9DQogCSAgICBicmVhazsNCiAJICB9DQpJbmRleDogZ3J1Yi9DaGFuZ2VMb2cuemZz LWRldmljZXMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSAvZGV2L251bGwJMTk3MC0wMS0wMSAwMDowMDowMC4w MDAwMDAwMDAgKzAwMDANCisrKyBncnViL0NoYW5nZUxvZy56ZnMtZGV2aWNlcwkyMDEyLTAyLTI3 IDAxOjIwOjEwLjgzOTg5MjAwMCAtMDYwMA0KQEAgLTAsMCArMSw1IEBADQorMjAxMi0wMi0yNyAg UmljaGFyZCBMYWFnZXIgPHJsYWFnZXJAd2lrdGVsLmNvbT4NCisNCisJKiB1dGlsL2dldHJvb3Qu YyAoZmluZF9yb290X2RldmljZXNfZnJvbV9wb29sbmFtZSk6IEhhbmRsZSBaRlMgdmRldnMNCisJ ICB3aXRoIGZ1bGwgcGF0aHMuDQorDQo= --=-o8Qb0A9yMkapaa+8UuNt Content-Disposition: attachment; filename="zfs-fstype.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="zfs-fstype.patch"; charset="UTF-8" U3VwcG9ydCBuYXRpdmUgWkZTIG9uIExpbnV4Lg0KDQpJbmRleDogZ3J1Yi91dGlsL2dldHJvb3Qu Yw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQ0KLS0tIGdydWIub3JpZy91dGlsL2dldHJvb3QuYwkyMDEyLTAyLTI3IDAx OjEwOjA3LjIzNzM0NDAwMCAtMDYwMA0KKysrIGdydWIvdXRpbC9nZXRyb290LmMJMjAxMi0wMi0y NyAwMToyNDoxMy42OTMxNDUwMDAgLTA2MDANCkBAIC00NzksNyArNDc5LDggQEAgZ3J1Yl9maW5k X3Jvb3RfZGV2aWNlc19mcm9tX21vdW50aW5mbyAoYw0KICAgICAgIGlmICghKmVudHJpZXNbaV0u ZGV2aWNlKQ0KIAljb250aW51ZTsNCiANCi0gICAgICBpZiAoZ3J1Yl9zdHJjbXAgKGVudHJpZXNb aV0uZnN0eXBlLCAiZnVzZS56ZnMiKSA9PSAwKQ0KKyAgICAgIGlmIChncnViX3N0cmNtcCAoZW50 cmllc1tpXS5mc3R5cGUsICJmdXNlLnpmcyIpID09IDAgfHwNCisgICAgICAgICAgZ3J1Yl9zdHJj bXAgKGVudHJpZXNbaV0uZnN0eXBlLCAiemZzIikgPT0gMCkNCiAJew0KIAkgIGNoYXIgKnNsYXNo Ow0KIAkgIHNsYXNoID0gc3RyY2hyIChlbnRyaWVzW2ldLmRldmljZSwgJy8nKTsNCkluZGV4OiBn cnViL0NoYW5nZUxvZy56ZnMtZnN0eXBlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gL2Rldi9udWxsCTE5NzAt MDEtMDEgMDA6MDA6MDAuMDAwMDAwMDAwICswMDAwDQorKysgZ3J1Yi9DaGFuZ2VMb2cuemZzLWZz dHlwZQkyMDEyLTAyLTI3IDAxOjI2OjIwLjU0ODk1ODAwMCAtMDYwMA0KQEAgLTAsMCArMSw1IEBA DQorMjAxMi0wMi0yNyAgUmljaGFyZCBMYWFnZXIgPHJsYWFnZXJAd2lrdGVsLmNvbT4NCisNCisJ KiB1dGlsL2dldHJvb3QuYyAoZ3J1Yl9maW5kX3Jvb3RfZGV2aWNlc19mcm9tX21vdW50aW5mbyk6 IFN1cHBvcnQNCisJICB0aGUgbmF0aXZlIFpGUyBvbiBMaW51eCBmc3R5cGUgKCJ6ZnMiKS4NCisN Cg== --=-o8Qb0A9yMkapaa+8UuNt-- --=-watBT3kr8ZG4netXVlyC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk9LMWoACgkQbfU6uV4fG87ZHgCg7EFh9ZmSmF3Uc8kWAXKvW5ud /KEAoJ7huwomL+U8OZEwd30ZdUTATh35 =K65e -----END PGP SIGNATURE----- --=-watBT3kr8ZG4netXVlyC--