[src/netbsd-1-5]: src/etc/rc.d pullup 1.16 -> 1.18 (approved by releng-1-5)

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

details:   https://anonhg.NetBSD.org/src/rev/39bc6023d98f
branches:  netbsd-1-5
changeset: 488861:39bc6023d98f
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Aug 03 12:07:27 2000 +0000

description:
pullup 1.16 -> 1.18 (approved by releng-1-5)

 > we need to sleep for IPv6 DAD period, before and after rtsol.
 > (they are for stability in boot-time configuration)
 > comment from perry.

diffstat:

 etc/rc.d/network |  22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 41948efb58eb -r 39bc6023d98f etc/rc.d/network
--- a/etc/rc.d/network  Thu Aug 03 11:46:12 2000 +0000
+++ b/etc/rc.d/network  Thu Aug 03 12:07:27 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: network,v 1.11.4.2 2000/07/25 19:12:20 jdolecek Exp $
+# $NetBSD: network,v 1.11.4.3 2000/08/03 12:07:27 itojun Exp $
 #
 
 # PROVIDE: network
@@ -283,6 +283,13 @@
 
                esac
 
+               # wait till DAD is completed. always invoke it in case
+               # if are configured manually by ifconfig
+               #
+               dadcount=`sysctl -n net.inet6.ip6.dad_count 2>/dev/null`
+               sleep $dadcount
+               sleep 1
+
                if checkyesno rtsol; then
                        if [ "$ip6mode" = "autohost" ]; then
                                echo 'Sending router solicitation...'
@@ -292,14 +299,13 @@
                                warn \
                            "ip6mode must be set to 'autohost' to use rtsol."
                        fi
+
+                       # wait till DAD is completed, for global addresses
+                       # configured by router advert message.
+                       #
+                       sleep $dadcount
+                       sleep 1
                fi
-
-               # wait till DAD is completed. always invoke it in case if are
-               # configured manually by ifconfig
-               #
-               dadcount=`sysctl -n net.inet6.ip6.dad_count 2>/dev/null`
-               sleep $dadcount
-               sleep 1
        fi
 
        # XXX this must die