From owner-svn-src-head@FreeBSD.ORG Sat Oct 27 09:03:47 2012 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE9DAD9C; Sat, 27 Oct 2012 09:03:46 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) by mx1.freebsd.org (Postfix) with ESMTP id 2A0958FC0A; Sat, 27 Oct 2012 09:03:45 +0000 (UTC) Received: from alph.allbsd.org (p1137-ipbf1505funabasi.chiba.ocn.ne.jp [118.7.212.137]) (authenticated bits=128) by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id q9R93Ut3016577 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 27 Oct 2012 18:03:40 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0) by alph.allbsd.org (8.14.5/8.14.5) with ESMTP id q9R93SZF002304; Sat, 27 Oct 2012 18:03:29 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Sat, 27 Oct 2012 18:03:21 +0900 (JST) Message-Id: <20121027.180321.1646410521945318717.hrs@allbsd.org> To: brian@FreeBSD.org Subject: Re: svn commit: r242074 - head/etc/rc.d From: Hiroki Sato In-Reply-To: <20121027083156.GA81040@thong.lan.Awfulhak.org> References: <20121027.165129.351491404794553651.hrs@allbsd.org> <20121027.170139.1459930438153883844.hrs@allbsd.org> <20121027083156.GA81040@thong.lan.Awfulhak.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.5 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Sat_Oct_27_18_03_21_2012_661)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.allbsd.org [133.31.130.32]); Sat, 27 Oct 2012 18:03:40 +0900 (JST) X-Spam-Status: No, score=-98.1 required=13.0 tests=CONTENT_TYPE_PRESENT, ONLY1HOPDIRECT,SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gatekeeper.allbsd.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, dim@FreeBSD.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2012 09:03:47 -0000 ----Security_Multipart(Sat_Oct_27_18_03_21_2012_661)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Brian Somers wrote in <20121027083156.GA81040@thong.lan.Awfulhak.org>: br> On Sat, Oct 27, 2012 at 05:01:39PM +0900, Hiroki Sato wrote: br> > Hiroki Sato wrote br> > in <20121027.165129.351491404794553651.hrs@allbsd.org>: br> > hr> Thank you. It is explained in section 3.2.4 in br> > hr> br> > hr> http://www.freebsd.org/releases/9.0R/relnotes-detailed.html#UPGRADE br> > hr> br> > hr> I think it will work as 8.X just after removing the ipv6_enable=YES br> > hr> line in your rc.conf, but after investigating the network.subr br> > hr> closely I found a bug in backward compatibility of ipv6_enable=YES on br> > hr> 9.X... Can you try the attached patch? This should fix the issue br> > hr> even if ipv6_enable=YES exists on a 9.X's rc.conf without a patch to br> > hr> rc.d/rtadvd. br> > br> > Gr, sorry. The previous patch was wrong. The correct one is br> > attached to this mail. br> > br> > -- Hiroki br> br> > Index: etc/network.subr br> > =================================================================== br> > --- etc/network.subr (revision 242114) br> > +++ etc/network.subr (working copy) br> > @@ -109,7 +109,9 @@ br> > # backward compatibility: $ipv6_enable br> > case $ipv6_enable in br> > [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) br> > - _ipv6_opts="${_ipv6_opts} accept_rtadv" br> > + if ! checkyesno ipv6_gateway_enable; then br> > + _ipv6_opts="${_ipv6_opts} accept_rtadv" br> > + fi br> > ;; br> > esac br> > br> > @@ -488,7 +490,11 @@ br> > # backward compatibility: $ipv6_enable br> > case $ipv6_enable in br> > [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) br> > - return 0 br> > + if checkyesno ipv6_gateway_enable; then br> > + return 1 br> > + else br> > + return 0 br> > + fi br> > ;; br> > esac br> > br> br> Yep, that fixes the issue. Everything works now both with and br> without ipv6_enable in rc.conf. Thanks for your help. br> br> It might be worth asking re@ if the above patch can be squeezed br> into 9.1 before the release? br> br> I'm also ok with backing the original /etc/rc.d/rtadvd change out br> if you prefer? Thank you for testing it! Today I will commit them including revert of rc.d/rtadvd to head (since network.subr on head is also broken partially) and then send a merge request of the fix. -- Hiroki ----Security_Multipart(Sat_Oct_27_18_03_21_2012_661)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAlCLo1kACgkQTyzT2CeTzy2/PwCgu67V4iWvvDPK8iPTshtuA1ib WfEAn1XzeUyVnZaNJBnfwDWsM4G3D9u5 =7Vri -----END PGP SIGNATURE----- ----Security_Multipart(Sat_Oct_27_18_03_21_2012_661)----