diff options
| author | ume <ume@FreeBSD.org> | 2006-10-07 15:45:56 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2006-10-07 15:45:56 +0000 |
| commit | 364695cff6ad0979767b454c9dffe63e596fdb40 (patch) | |
| tree | 0d75bac3d35d111c746cfff635ef75dfa75d1140 | |
| parent | 4ddba1a166b3873845b32fe90d2ddd261f53608b (diff) | |
| download | FreeBSD-src-364695cff6ad0979767b454c9dffe63e596fdb40.zip FreeBSD-src-364695cff6ad0979767b454c9dffe63e596fdb40.tar.gz | |
Restore the behavior that net.inet6.ip6.auto_linklocal=0 could
be coexist with ipv6_enable="YES".
MFC after: 3 days
| -rw-r--r-- | etc/network.subr | 4 | ||||
| -rwxr-xr-x | etc/rc.d/Makefile | 2 | ||||
| -rw-r--r-- | etc/rc.d/auto_linklocal | 18 |
3 files changed, 19 insertions, 5 deletions
diff --git a/etc/network.subr b/etc/network.subr index ef344ae..de2aaf4 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -41,10 +41,6 @@ ifconfig_up() { _cfg=1 - if checkyesno ipv6_enable; then - ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 - fi - ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 11f89ab..779844c 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -5,7 +5,7 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 auditd \ + apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ diff --git a/etc/rc.d/auto_linklocal b/etc/rc.d/auto_linklocal new file mode 100644 index 0000000..ea22631 --- /dev/null +++ b/etc/rc.d/auto_linklocal @@ -0,0 +1,18 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: auto_linklocal +# REQUIRE: root +# BEFORE: sysctl + +. /etc/rc.subr + +name="auto_linklocal" +rcvar=`set_rcvar ipv6` +start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1" +stop_cmd=":" + +load_rc_config $name +run_rc_command "$1" |
