[src/trunk]: src/etc/rc.d remove some stuff we don't have; rename rc command ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31f76f82ce52
branches:  trunk
changeset: 812604:31f76f82ce52
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 23 04:38:00 2015 +0000

description:
remove some stuff we don't have; rename rc command variable.

diffstat:

 etc/rc.d/ip6addrctl |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (27 lines):

diff -r bb7e215d6748 -r 31f76f82ce52 etc/rc.d/ip6addrctl
--- a/etc/rc.d/ip6addrctl       Wed Dec 23 00:13:57 2015 +0000
+++ b/etc/rc.d/ip6addrctl       Wed Dec 23 04:38:00 2015 +0000
@@ -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_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)