From owner-svn-src-head@FreeBSD.ORG Sat Oct 27 08:32:01 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 17BBE9E; Sat, 27 Oct 2012 08:32:01 +0000 (UTC) (envelope-from brian@awfulhak.org) Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) by mx1.freebsd.org (Postfix) with ESMTP id 826F08FC08; Sat, 27 Oct 2012 08:32:00 +0000 (UTC) Received: from pd4ml1so-ssvc.prod.shaw.ca ([10.0.141.141]) by pd2mo1so-svcs.prod.shaw.ca with ESMTP; 27 Oct 2012 02:31:59 -0600 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=YV/ZfMFUOxaYfNdUyKHndRAzOL9/4mKBz/+5TfOlk9g= c=1 sm=1 a=wom5GMh1gUkA:10 a=gyNmXv_Ll5gA:10 a=dBRESv0yCI8A:10 a=BLceEmwcHowA:10 a=Jvqgub9IZPV2TmRqH1mFPg==:17 a=6I5d2MoRAAAA:8 a=Wi8YH2NmAAAA:8 a=MMwg4So0AAAA:8 a=RhZB3JRgOTxT6rRC0fkA:9 a=CjuIK1q_8ugA:10 a=feu_IAEBeuoA:10 a=SV7veod9ZcQA:10 a=2_Ak67o2eQwA:10 a=WJ3hkfHDukgA:10 a=LPLRibRuTFt_r7GVflgA:9 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO gw.Awfulhak.org) ([174.7.169.46]) by pd4ml1so-dmz.prod.shaw.ca with ESMTP; 27 Oct 2012 02:31:59 -0600 Received: from thong.lan.Awfulhak.org (thong.lan.Awfulhak.org [172.16.0.31]) by gw.Awfulhak.org (8.14.5/8.14.5) with ESMTP id q9R8VuVW003391 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 27 Oct 2012 01:31:56 -0700 (PDT) (envelope-from brian@lan.Awfulhak.org) Received: from thong.lan.Awfulhak.org (localhost [127.0.0.1]) by thong.lan.Awfulhak.org (8.14.5/8.14.5) with ESMTP id q9R8VueT081074; Sat, 27 Oct 2012 01:31:56 -0700 (PDT) (envelope-from brian@thong.lan.Awfulhak.org) Received: (from brian@localhost) by thong.lan.Awfulhak.org (8.14.5/8.14.5/Submit) id q9R8Vu5t081073; Sat, 27 Oct 2012 01:31:56 -0700 (PDT) (envelope-from brian) Date: Sat, 27 Oct 2012 01:31:56 -0700 From: Brian Somers To: Hiroki Sato Subject: Re: svn commit: r242074 - head/etc/rc.d Message-ID: <20121027083156.GA81040@thong.lan.Awfulhak.org> References: <20121027.155707.2226765252880570777.hrs@allbsd.org> <20121027072048.GB77528@thong.lan.Awfulhak.org> <20121027.165129.351491404794553651.hrs@allbsd.org> <20121027.170139.1459930438153883844.hrs@allbsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nFreZHaLTZJo0R7j" Content-Disposition: inline In-Reply-To: <20121027.170139.1459930438153883844.hrs@allbsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-1.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gw.lan.Awfulhak.org Cc: svn-src-head@FreeBSD.org, dim@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, brian@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 08:32:01 -0000 --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Oct 27, 2012 at 05:01:39PM +0900, Hiroki Sato wrote: > Hiroki Sato wrote > in <20121027.165129.351491404794553651.hrs@allbsd.org>: > hr> Thank you. It is explained in section 3.2.4 in > hr> > hr> http://www.freebsd.org/releases/9.0R/relnotes-detailed.html#UPGRADE > hr> > hr> I think it will work as 8.X just after removing the ipv6_enable=3DYES > hr> line in your rc.conf, but after investigating the network.subr > hr> closely I found a bug in backward compatibility of ipv6_enable=3DYES= on > hr> 9.X... Can you try the attached patch? This should fix the issue > hr> even if ipv6_enable=3DYES exists on a 9.X's rc.conf without a patch = to > hr> rc.d/rtadvd. >=20 > Gr, sorry. The previous patch was wrong. The correct one is > attached to this mail. >=20 > -- Hiroki > Index: etc/network.subr > =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 > --- etc/network.subr (revision 242114) > +++ etc/network.subr (working copy) > @@ -109,7 +109,9 @@ > # backward compatibility: $ipv6_enable > case $ipv6_enable in > [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) > - _ipv6_opts=3D"${_ipv6_opts} accept_rtadv" > + if ! checkyesno ipv6_gateway_enable; then > + _ipv6_opts=3D"${_ipv6_opts} accept_rtadv" > + fi > ;; > esac >=20 > @@ -488,7 +490,11 @@ > # backward compatibility: $ipv6_enable > case $ipv6_enable in > [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) > - return 0 > + if checkyesno ipv6_gateway_enable; then > + return 1 > + else > + return 0 > + fi > ;; > esac >=20 Yep, that fixes the issue. Everything works now both with and without ipv6_enable in rc.conf. Thanks for your help. It might be worth asking re@ if the above patch can be squeezed into 9.1 before the release? I'm also ok with backing the original /etc/rc.d/rtadvd change out if you prefer? Thanks again. --=20 Brian Somers Don't _EVER_ lose your sense of humour ! --nFreZHaLTZJo0R7j Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQCVAwUBUIub/A7tvOdmanQhAQK19gQAlK4L2yyMJ4rwSoZgYABKmV7MaNsncPF0 +5TjCnLhO89m57Skq92nnIR5VBVEFaPGnAcbwcFOclu7rq/LNwi8rEtvuey4g9Zv uSf9e6nvvH8FoA+kFBZzokfet/M9GGD7fSJGZqpuzm5+wmYDVV5I+Ulr+QqO0e8r cBIIycuQ4QA= =tdj8 -----END PGP SIGNATURE----- --nFreZHaLTZJo0R7j--