From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RtHCc-0003RX-84 for mharc-grub-devel@gnu.org; Fri, 03 Feb 2012 06:21:14 -0500 Received: from eggs.gnu.org ([140.186.70.92]:40061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtHCX-0003RE-A2 for grub-devel@gnu.org; Fri, 03 Feb 2012 06:21:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtHCO-0000ow-Ai for grub-devel@gnu.org; Fri, 03 Feb 2012 06:21:09 -0500 Received: from spam1.wiktel.com ([69.89.207.151]:48851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtHCO-0000oc-4Z for grub-devel@gnu.org; Fri, 03 Feb 2012 06:21:00 -0500 Received: from [172.16.0.253] (thief-pool2-121-14.mncable.net [24.225.121.14]) (authenticated bits=0) by spam1.wiktel.com (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id q13BKsio028165; Fri, 3 Feb 2012 05:20:55 -0600 Subject: Re: [Patch] Robustly search for ZFS labels & uberblocks From: Richard Laager To: Vladimir =?UTF-8?Q?=27=CF=86-coder/phcoder=27?= Serbinenko In-Reply-To: <4F2BAE50.5060809@gmail.com> References: <4E838F85.6060001@gmail.com> <1326973014.6387.224.camel@watermelon.coderich.net> <4F1C1ABD.1010303@gmail.com> <1327719035.9477.68.camel@watermelon.coderich.net> <4F23EF3C.9050407@gmail.com> <1327775600.9477.174.camel@watermelon.coderich.net> <4F25CB6C.7090204@gmail.com> <1327999542.3471.20.camel@watermelon.coderich.net> <4F2BAE50.5060809@gmail.com> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-c4ybhZLQBYlPmgWsbmWn" Date: Fri, 03 Feb 2012 05:20:54 -0600 Message-ID: <1328268054.17279.25.camel@watermelon.coderich.net> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-bounce-key: wiktel.com-1; rlaager@wiktel.com; 1328268055; FnwqwRa7PxdPmH/lVQaIFbyZeHc; X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 69.89.207.151 Cc: grub-devel@gnu.org 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: Fri, 03 Feb 2012 11:21:13 -0000 --=-c4ybhZLQBYlPmgWsbmWn Content-Type: multipart/mixed; boundary="=-qDT+SV7jYPxKVBapt5GT" --=-qDT+SV7jYPxKVBapt5GT Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2012-02-03 at 10:52 +0100, Vladimir '=CF=86-coder/phcoder' Serbinen= ko wrote: > > zfs-on-linux-rlaager6.patch > > > > > > Handle pool names with trailing spaces > What about the ones with spaces in the middle? It feels like the logic= =20 > is broken elsewhere and using strncmp is just a workaround which works= =20 > only for one particular case I've attached a new patch. I've tested it with both cases. I've also attached a patch that handles `zpool status` outputting full device paths. --=20 Richard --=-qDT+SV7jYPxKVBapt5GT Content-Disposition: attachment; filename="zfs-devices.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="zfs-devices.patch"; charset="UTF-8" SGFuZGxlIHZkZXZzIHdpdGggZnVsbCBwYXRocw0KDQpJbmRleDogdXRpbC9nZXRyb290LmMNCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NCi0tLSB1dGlsL2dldHJvb3QuYwkyMDEyLTAyLTAzIDA0OjIxOjI5LjE5OTI0OTU5 NCAtMDYwMA0KKysrIHV0aWwvZ2V0cm9vdC5jCTIwMTItMDItMDMgMDU6MDI6NTUuNjkzMjExMDAw IC0wNjAwDQpAQCAtMzAyLDcgKzMwMSwxMCBAQA0KIAkJICAgIGRldmljZXMgPSB4cmVhbGxvYyAo ZGV2aWNlcywgc2l6ZW9mIChkZXZpY2VzWzBdKQ0KIAkJCQkJKiBkZXZpY2VzX2FsbG9jYXRlZCk7 DQogCQkgIH0NCi0JCWRldmljZXNbbmRldmljZXMrK10gPSB4YXNwcmludGYgKCIvZGV2LyVzIiwg bmFtZSk7DQorCQlpZiAobmFtZVswXSA9PSAnLycpDQorCQkgIGRldmljZXNbbmRldmljZXMrK10g PSB4c3RyZHVwIChuYW1lKTsNCisJCWVsc2UNCisJCSAgZGV2aWNlc1tuZGV2aWNlcysrXSA9IHhh c3ByaW50ZiAoIi9kZXYvJXMiLCBuYW1lKTsNCiAJICAgICAgfQ0KIAkgICAgYnJlYWs7DQogCSAg fQ0K --=-qDT+SV7jYPxKVBapt5GT Content-Disposition: attachment; filename="zfs-poolname-spaces.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="zfs-poolname-spaces.patch"; charset="UTF-8" SGFuZGxlIHBvb2wgbmFtZXMgd2l0aCBzcGFjZXMNCg0KSW5kZXg6IHV0aWwvZ2V0cm9vdC5jDQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09DQotLS0gdXRpbC9nZXRyb290LmMJMjAxMi0wMi0wMyAwNDoyMToyOS4xOTkyNDk1 OTQgLTA2MDANCisrKyB1dGlsL2dldHJvb3QuYwkyMDEyLTAyLTAzIDA1OjAyOjU1LjY5MzIxMTAw MCAtMDYwMA0KQEAgLTI2MCw3ICsyNjAsNyBAQA0KICAgY2hhciBja3N1bVsyNTddLCBub3Rlc1sy NTddOw0KICAgdW5zaWduZWQgaW50IGR1bW15Ow0KIA0KLSAgY21kID0geGFzcHJpbnRmICgienBv b2wgc3RhdHVzICVzIiwgcG9vbG5hbWUpOw0KKyAgY21kID0geGFzcHJpbnRmICgienBvb2wgc3Rh dHVzIFwiJXNcIiIsIHBvb2xuYW1lKTsNCiAgIGZwID0gcG9wZW4gKGNtZCwgInIiKTsNCiAgIGZy ZWUgKGNtZCk7DQogDQpAQCAtMjg1LDggKzI4NSw3IEBADQogCSAgICAgIHN0Kys7DQogCSAgICBi cmVhazsNCiAJICBjYXNlIDE6DQotCSAgICBpZiAoIXN0cmNtcCAobmFtZSwgcG9vbG5hbWUpKQ0K LQkgICAgICBzdCsrOw0KKwkgICAgc3QrKzsNCiAJICAgIGJyZWFrOw0KIAkgIGNhc2UgMjoNCiAJ ICAgIGlmIChzdHJjbXAgKG5hbWUsICJtaXJyb3IiKSAmJiAhc3NjYW5mIChuYW1lLCAibWlycm9y LSV1IiwgJmR1bW15KQ0KQEAgLTQyMCw2ICs0MjIsOSBAQA0KICAgICAgIGlmIChzc2NhbmYgKHNl cCwgIiVzICVzIiwgZW50cnkuZnN0eXBlLCBlbnRyeS5kZXZpY2UpICE9IDIpDQogCWNvbnRpbnVl Ow0KIA0KKyAgICAgIHVuZXNjYXBlIChlbnRyeS5mc3R5cGUpOw0KKyAgICAgIHVuZXNjYXBlIChl bnRyeS5kZXZpY2UpOw0KKw0KICAgICAgIC8qIFVzaW5nIHRoZSBtb3VudCBJRHMsIGZpbmQgb3V0 IHdoZXJlIHRoaXMgZml0cyBpbiB0aGUgbGlzdCBvZg0KIAkgdmlzaWJsZSBtb3VudCBlbnRyaWVz IHdlJ3ZlIHNlZW4gc28gZmFyLiAgVGhlcmUgYXJlIHRocmVlDQogCSBpbnRlcmVzdGluZyBjYXNl cy4gIEZpcnN0bHksIGl0IG1heSBiZSBpbnNlcnRlZCBhdCB0aGUgZW5kOiB0aGlzIGlzDQo= --=-qDT+SV7jYPxKVBapt5GT-- --=-c4ybhZLQBYlPmgWsbmWn 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) iEYEABECAAYFAk8rwwoACgkQbfU6uV4fG87Y/wCcCQXDB2obSJEUKwDiE/LjxyxE ar0AnR0E8HnNMDttjDefPkw50p+5p04Z =Zxxe -----END PGP SIGNATURE----- --=-c4ybhZLQBYlPmgWsbmWn--