Date: Mon, 21 May 2012 15:09:33 -0600 From: Jamie Gritton <jamie@FreeBSD.org> To: freebsd-jail@FreeBSD.org Subject: Re: Breakage on 9 Message-ID: <4FBAAF0D.4000202@FreeBSD.org> In-Reply-To: <4FBA8859.1040604@schimke.net> References: <CAJOYFBAphvs-M7wR=SeYLS_dWCAv0gPR-oTMz4R-MDtTrdO6Zw@mail.gmail.com> <4FBA8859.1040604@schimke.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000009060703020009090207 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit I've got a fix that's going in as soon as it's confirmed. I'm including the patch here. Backing out r235624 will work, unless you happen to be on a box where r235624 was necessary. I had said something before about the long MFC, but that turned out to be wrong. That was for the new jail(8) code, but the nomount fix is in the libjail code. Actually, that was fixed a while back, but then I re-broke it (in a different way) with r235624. If anyone continues to have problems on 9 with the included patch, let me know. But I think this will bring it all into working order. - Jamie On 05/21/12 12:24, Nathan Schimke wrote: > On 05/21/2012 11:08 AM, Ed Schouten wrote: >> Hi, >> >> Today I was bitten by the "jail: unknown parameter: allow.nomount" >> bug. It seems this bug is at least more than one month old -- on >> 9-STABLE! Why hasn't the commit that introduced this bug been backed >> out? The code worked before. Now it's broken and we're waiting for an >> MFC period? Using a Danish (Dutch?) axe, I was able to at least get my >> box working again: > > I just hit the same error last night. Reverting r235624 (an MFC made 3 > days ago) got my jails working again, but I haven't yet figured out why. > > Nathan > _______________________________________________ > freebsd-jail@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-jail > To unsubscribe, send any mail to "freebsd-jail-unsubscribe@freebsd.org" --------------000009060703020009090207 Content-Type: text/plain; name="jail.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="jail.diff" SW5kZXg6IGphaWwuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBqYWlsLmMJKHJldmlzaW9uIDIzNTY2 OCkKKysrIGphaWwuYwkod29ya2luZyBjb3B5KQpAQCAtODUzLDcgKzg1Myw3IEBACiBzdGF0 aWMgaW50CiBqYWlscGFyYW1fdHlwZShzdHJ1Y3QgamFpbHBhcmFtICpqcCkKIHsKLQljaGFy ICpwLCAqbm5hbWU7CisJY2hhciAqcCwgKm5hbWUsICpubmFtZTsKIAlzaXplX3QgbWlibGVu LCBkZXNjbGVuOwogCWludCBpLCBpc2FycmF5OwogCXN0cnVjdCB7CkBAIC04NjMsNyArODYz LDggQEAKIAlpbnQgbWliW0NUTF9NQVhOQU1FXTsKIAogCS8qIFRoZSAibGFzdGppZCIgcGFy YW1ldGVyIGlzbid0IHJlYWwuICovCi0JaWYgKCFzdHJjbXAoanAtPmpwX25hbWUsICJsYXN0 amlkIikpIHsKKwluYW1lID0ganAtPmpwX25hbWU7CisJaWYgKCFzdHJjbXAobmFtZSwgImxh c3RqaWQiKSkgewogCQlqcC0+anBfdmFsdWVsZW4gPSBzaXplb2YoaW50KTsKIAkJanAtPmpw X2N0bHR5cGUgPSBDVExUWVBFX0lOVCB8IENUTEZMQUdfV1I7CiAJCXJldHVybiAoMCk7CkBA IC04NzIsMTkgKzg3MywxOSBAQAogCS8qIEZpbmQgdGhlIHN5c2N0bCB0aGF0IGRlc2NyaWJl cyB0aGUgcGFyYW1ldGVyLiAqLwogCW1pYlswXSA9IDA7CiAJbWliWzFdID0gMzsKLQlzbnBy aW50ZihkZXNjLnMsIHNpemVvZihkZXNjLnMpLCBTSlBBUkFNICIuJXMiLCBqcC0+anBfbmFt ZSk7CisJc25wcmludGYoZGVzYy5zLCBzaXplb2YoZGVzYy5zKSwgU0pQQVJBTSAiLiVzIiwg bmFtZSk7CiAJbWlibGVuID0gc2l6ZW9mKG1pYikgLSAyICogc2l6ZW9mKGludCk7CiAJaWYg KHN5c2N0bChtaWIsIDIsIG1pYiArIDIsICZtaWJsZW4sIGRlc2Mucywgc3RybGVuKGRlc2Mu cykpIDwgMCkgewogCQlpZiAoZXJybm8gIT0gRU5PRU5UKSB7CiAJCQlzbnByaW50ZihqYWls X2Vycm1zZywgSkFJTF9FUlJNU0dMRU4sCi0JCQkgICAgInN5c2N0bCgwLjMuJXMpOiAlcyIs IGpwLT5qcF9uYW1lLCBzdHJlcnJvcihlcnJubykpOworCQkJICAgICJzeXNjdGwoMC4zLiVz KTogJXMiLCBuYW1lLCBzdHJlcnJvcihlcnJubykpOwogCQkJcmV0dXJuICgtMSk7CiAJCX0K IAkJLyoKIAkJICogVGhlIHBhcmFtZXRlciBwcm9iYWJseSBkb2Vzbid0IGV4aXN0LiAgQnV0 IGl0IG1pZ2h0IGJlCiAJCSAqIHRoZSAibm8iIGNvdW50ZXJwYXJ0IHRvIGEgYm9vbGVhbi4K IAkJICovCi0JCW5uYW1lID0gbm9ub25hbWUoanAtPmpwX25hbWUpOworCQlubmFtZSA9IG5v bm9uYW1lKG5hbWUpOwogCQlpZiAobm5hbWUgPT0gTlVMTCkgewogCQl1bmtub3duX3BhcmFt ZXRlcjoKIAkJCXNucHJpbnRmKGphaWxfZXJybXNnLCBKQUlMX0VSUk1TR0xFTiwKQEAgLTg5 Miw4ICs4OTMsMTAgQEAKIAkJCWVycm5vID0gRU5PRU5UOwogCQkJcmV0dXJuICgtMSk7CiAJ CX0KLQkJc25wcmludGYoZGVzYy5zLCBzaXplb2YoZGVzYy5zKSwgU0pQQVJBTSAiLiVzIiwg bm5hbWUpOworCQluYW1lID0gYWxsb2NhKHN0cmxlbihubmFtZSkgKyAxKTsKKwkJc3RyY3B5 KG5hbWUsIG5uYW1lKTsKIAkJZnJlZShubmFtZSk7CisJCXNucHJpbnRmKGRlc2Mucywgc2l6 ZW9mKGRlc2MucyksIFNKUEFSQU0gIi4lcyIsIG5hbWUpOwogCQltaWJsZW4gPSBzaXplb2Yo bWliKSAtIDIgKiBzaXplb2YoaW50KTsKIAkJaWYgKHN5c2N0bChtaWIsIDIsIG1pYiArIDIs ICZtaWJsZW4sIGRlc2MucywKIAkJICAgIHN0cmxlbihkZXNjLnMpKSA8IDApCkBAIC05MDYs NyArOTA5LDcgQEAKIAlpZiAoc3lzY3RsKG1pYiwgKG1pYmxlbiAvIHNpemVvZihpbnQpKSAr IDIsICZkZXNjLCAmZGVzY2xlbiwKIAkgICAgTlVMTCwgMCkgPCAwKSB7CiAJCXNucHJpbnRm KGphaWxfZXJybXNnLCBKQUlMX0VSUk1TR0xFTiwKLQkJICAgICJzeXNjdGwoMC40LiVzKTog JXMiLCBqcC0+anBfbmFtZSwgc3RyZXJyb3IoZXJybm8pKTsKKwkJICAgICJzeXNjdGwoMC40 LiVzKTogJXMiLCBuYW1lLCBzdHJlcnJvcihlcnJubykpOwogCQlyZXR1cm4gKC0xKTsKIAl9 CiAJanAtPmpwX2N0bHR5cGUgPSBkZXNjLmk7CkBAIC05NTIsNyArOTU1LDcgQEAKIAkJaWYg KHN5c2N0bChtaWIgKyAyLCBtaWJsZW4gLyBzaXplb2YoaW50KSwgZGVzYy5zLCAmZGVzY2xl biwKIAkJICAgIE5VTEwsIDApIDwgMCkgewogCQkJc25wcmludGYoamFpbF9lcnJtc2csIEpB SUxfRVJSTVNHTEVOLAotCQkJICAgICJzeXNjdGwoIiBTSlBBUkFNICIuJXMpOiAlcyIsIGpw LT5qcF9uYW1lLAorCQkJICAgICJzeXNjdGwoIiBTSlBBUkFNICIuJXMpOiAlcyIsIG5hbWUs CiAJCQkgICAgc3RyZXJyb3IoZXJybm8pKTsKIAkJCXJldHVybiAoLTEpOwogCQl9CkBAIC05 NzAsNyArOTczLDcgQEAKIAkJCWlmIChzeXNjdGwobWliICsgMiwgbWlibGVuIC8gc2l6ZW9m KGludCksCiAJCQkgICAgTlVMTCwgJmpwLT5qcF92YWx1ZWxlbiwgTlVMTCwgMCkgPCAwKSB7 CiAJCQkJc25wcmludGYoamFpbF9lcnJtc2csIEpBSUxfRVJSTVNHTEVOLAotCQkJCSAgICAi c3lzY3RsKCIgU0pQQVJBTSAiLiVzKTogJXMiLCBqcC0+anBfbmFtZSwKKwkJCQkgICAgInN5 c2N0bCgiIFNKUEFSQU0gIi4lcyk6ICVzIiwgbmFtZSwKIAkJCQkgICAgc3RyZXJyb3IoZXJy bm8pKTsKIAkJCQlyZXR1cm4gKC0xKTsKIAkJCX0KQEAgLTk5NSwxMCArOTk4LDkgQEAKIAkJ CQkgICAgInN5c2N0bCgwLjEpOiAlcyIsIHN0cmVycm9yKGVycm5vKSk7CiAJCQkJcmV0dXJu ICgtMSk7CiAJCQl9Ci0JCQlpZiAoZGVzY2xlbiA9PQotCQkJICAgIHNpemVvZihTSlBBUkFN KSArIHN0cmxlbihqcC0+anBfbmFtZSkgKyAyICYmCisJCQlpZiAoZGVzY2xlbiA9PSBzaXpl b2YoU0pQQVJBTSkgKyBzdHJsZW4obmFtZSkgKyAyICYmCiAJCQkgICAgbWVtY21wKFNKUEFS QU0gIi4iLCBkZXNjLnMsIHNpemVvZihTSlBBUkFNKSkgPT0gMCAmJgotCQkJICAgIG1lbWNt cChqcC0+anBfbmFtZSwgZGVzYy5zICsgc2l6ZW9mKFNKUEFSQU0pLAorCQkJICAgIG1lbWNt cChuYW1lLCBkZXNjLnMgKyBzaXplb2YoU0pQQVJBTSksCiAJCQkgICAgZGVzY2xlbiAtIHNp emVvZihTSlBBUkFNKSAtIDIpID09IDAgJiYKIAkJCSAgICBkZXNjLnNbZGVzY2xlbiAtIDJd ID09ICcuJykKIAkJCQlnb3RvIG1pYl9kZXNjOwo= --------------000009060703020009090207--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FBAAF0D.4000202>