svn commit: r242074 - head/etc/rc.d

[Brian Somers]

On Sat, Oct 27, 2012 at 05:01:39PM +0900, Hiroki Sato wrote:
> Hiroki Sato <hrs at FreeBSD.org> wrote
>   in <20121027.165129.351491404794553651.hrs at 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=YES
> hr>  line in your rc.conf, but after investigating the network.subr
> hr>  closely I found a bug in backward compatibility of ipv6_enable=YES on
> hr>  9.X...  Can you try the attached patch?  This should fix the issue
> hr>  even if ipv6_enable=YES exists on a 9.X's rc.conf without a patch to
> hr>  rc.d/rtadvd.
> 
>  Gr, sorry.  The previous patch was wrong.  The correct one is
>  attached to this mail.
> 
> -- Hiroki

> Index: etc/network.subr
> ===================================================================
> --- 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="${_ipv6_opts} accept_rtadv"
> +			if ! checkyesno ipv6_gateway_enable; then
> +				_ipv6_opts="${_ipv6_opts} accept_rtadv"
> +			fi
>  			;;
>  		esac
> 
> @@ -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
> 

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.

-- 
Brian Somers                                          <brian at Awfulhak.org>
Don't _EVER_ lose your sense of humour !               <brian at FreeBSD.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 306 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20121027/a8f9bc0e/attachment.sig>