Date: Sat, 27 Oct 2012 20:17:59 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r242189 - releng/9.1/etc Message-ID: <201210272017.q9RKHxcH050958@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Oct 27 20:17:59 2012 New Revision: 242189 URL: http://svn.freebsd.org/changeset/base/242189 Log: MFC of r242187: Fix an issue when ipv6_enable=YES && ipv6_gateway_enable=YES which could prevent rtadvd(8) from working as intended. Approved by: re (kib) Modified: releng/9.1/etc/network.subr Directory Properties: releng/9.1/etc/ (props changed) Modified: releng/9.1/etc/network.subr ============================================================================== --- releng/9.1/etc/network.subr Sat Oct 27 19:56:57 2012 (r242188) +++ releng/9.1/etc/network.subr Sat Oct 27 20:17:59 2012 (r242189) @@ -109,7 +109,9 @@ ifconfig_up() # 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 @@ ipv6_autoconfif() # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210272017.q9RKHxcH050958>