[src/trunk]: src/etc ip6forwarding -> ip6mode change (somehow i forgot to com...

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

details:   https://anonhg.NetBSD.org/src/rev/adde08afe2cc
branches:  trunk
changeset: 481938:adde08afe2cc
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Feb 09 16:24:03 2000 +0000

description:
ip6forwarding -> ip6mode change (somehow i forgot to commit...)
PR: 9375

diffstat:

 etc/netstart |  7 +------
 etc/rc       |  6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r edc5e71922ba -r adde08afe2cc etc/netstart
--- a/etc/netstart      Wed Feb 09 15:40:23 2000 +0000
+++ b/etc/netstart      Wed Feb 09 16:24:03 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: netstart,v 1.71 2000/02/05 17:52:06 itojun Exp $
+#      $NetBSD: netstart,v 1.72 2000/02/09 16:24:03 itojun Exp $
 #      from: @(#)netstart      8.1 (Berkeley) 7/23/93
 
 if [ -f /etc/rc.subr ]; then
@@ -258,11 +258,6 @@
        dadcount=`sysctl -n net.inet6.ip6.dad_count 2>/dev/null`
        sleep $dadcount
        sleep 1
-else
-       # We do not have IPv6 support in kernel.
-       if checkyesno ip6forwarding || checkyesno rtsol; then
-               echo "WARNING: ip6 requested without kernel IPv6 config"
-       fi
 fi
 
 if [ -s /etc/netstart.local ]; then
diff -r edc5e71922ba -r adde08afe2cc etc/rc
--- a/etc/rc    Wed Feb 09 15:40:23 2000 +0000
+++ b/etc/rc    Wed Feb 09 16:24:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc,v 1.146 2000/02/05 17:02:42 itojun Exp $
+#      $NetBSD: rc,v 1.147 2000/02/09 16:24:03 itojun Exp $
 #      originally from: @(#)rc 8.2 (Berkeley) 3/17/94
 
 # System startup script run by init on autoboot
@@ -513,11 +513,11 @@
 fi
 
 if checkyesno rtadvd; then
-       if checkyesno ip6forwarding; then
+       if test "x$ip6mode" = "xrouter"; then
                echo -n ' rtadvd';      rtadvd $rtadvd_flags
        else
                echo
-               logger -s "WARNING: rtadvd cannot be used on IPv6 host."
+               logger -s "WARNING: rtadvd can be used on IPv6 router only."
        fi
 fi