Brian Somers <br...@freebsd.org> wrote in <20121027083156.ga81...@thong.lan.awfulhak.org>:
br> On Sat, Oct 27, 2012 at 05:01:39PM +0900, Hiroki Sato wrote: br> > Hiroki Sato <h...@freebsd.org> wrote br> > in <20121027.165129.351491404794553651....@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
pgpbMazUmTpbf.pgp
Description: PGP signature
