Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/etc flip "if" order in IPv6 initialization, avoid calling /b...



details:   https://anonhg.NetBSD.org/src/rev/f552016490e6
branches:  trunk
changeset: 479736:f552016490e6
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Dec 20 15:51:14 1999 +0000

description:
flip "if" order in IPv6 initialization, avoid calling /bin/test.
From: soda

diffstat:

 etc/netstart |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (38 lines):

diff -r e3416682c16c -r f552016490e6 etc/netstart
--- a/etc/netstart      Mon Dec 20 15:35:55 1999 +0000
+++ b/etc/netstart      Mon Dec 20 15:51:14 1999 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: netstart,v 1.66 1999/12/20 15:12:23 itojun Exp $
+#      $NetBSD: netstart,v 1.67 1999/12/20 15:51:14 itojun Exp $
 #      from: @(#)netstart      8.1 (Berkeley) 7/23/93
 
 if [ -f /etc/rc.subr ]; then
@@ -199,13 +199,7 @@
 
 # IPv6
 # Note that manual configuration can be done in the above, using ifconfig.
-ifconfig lo0 inet6 >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-       # We do not have IPv6 support in kernel.
-       if checkyesno ip6forwarding || checkyesno rtsol; then
-               echo "WARNING: ip6 requested without kernel IPv6 config"
-       fi
-else
+if ifconfig lo0 inet6 >/dev/null 2>&1; then
        # We have IPv6 support in kernel.
 
        # disallow scoped unicast dest without outgoing scope identifiers.
@@ -241,6 +235,11 @@
        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



Home | Main Index | Thread Index | Old Index