Module Name: src
Committed By: christos
Date: Wed Dec 23 04:38:00 UTC 2015
Modified Files:
src/etc/rc.d: ip6addrctl
Log Message:
remove some stuff we don't have; rename rc command variable.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/ip6addrctl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ip6addrctl
diff -u src/etc/rc.d/ip6addrctl:1.1 src/etc/rc.d/ip6addrctl:1.2
--- src/etc/rc.d/ip6addrctl:1.1 Sat Dec 12 21:05:15 2015
+++ src/etc/rc.d/ip6addrctl Tue Dec 22 23:38:00 2015
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="ip6addrctl"
-rcvar="ip6addrctl_enable"
+rcvar="ip6addrctl"
start_cmd="ip6addrctl_start"
stop_cmd="ip6addrctl_stop"
extra_commands="status prefer_ipv6 prefer_ipv4"
@@ -61,13 +61,7 @@ ip6addrctl_start()
${IP6ADDRCTL_CMD} flush >/dev/null 2>&1
${IP6ADDRCTL_CMD} install "${config_file}"
else
- if checkyesno ipv6_activate_all_interfaces; then
- ip6addrctl_prefer_ipv6
- elif [ -n "$(list_vars ifconfig_\*_ipv6)" ]; then
- ip6addrctl_prefer_ipv6
- else
- ip6addrctl_prefer_ipv4
- fi
+ ip6addrctl_prefer_ipv6
fi
;;
ipv4_prefer)
