[src/trunk]: src/share/sushi/system/rcconf Fixes to sushi for handling ipv6 a...

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

details:   https://anonhg.NetBSD.org/src/rev/9e4950248be0
branches:  trunk
changeset: 559846:9e4950248be0
user:      garbled <garbled%NetBSD.org@localhost>
date:      Wed Mar 24 18:47:08 2004 +0000

description:
Fixes to sushi for handling ipv6 autoconfiguration mode in the rc.conf
file. Provided by Peter Postma in followup to PR 24645

diffstat:

 share/sushi/system/rcconf/Makefile |   4 ++--
 share/sushi/system/rcconf/form     |   4 ++--
 share/sushi/system/rcconf/script4  |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 629cc19f543f -r 9e4950248be0 share/sushi/system/rcconf/Makefile
--- a/share/sushi/system/rcconf/Makefile        Wed Mar 24 18:22:47 2004 +0000
+++ b/share/sushi/system/rcconf/Makefile        Wed Mar 24 18:47:08 2004 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.2 2001/12/12 01:49:30 tv Exp $
+#      $NetBSD: Makefile,v 1.3 2004/03/24 18:47:08 garbled Exp $
 
 FILES= form
 FILESDIR=${BINDIR}/sushi/system/rcconf
-SCRIPTS= script script1 script2 script3
+SCRIPTS= script script1 script2 script3 script4
 SCRIPTSDIR=${BINDIR}/sushi/system/rcconf
 NOOBJ= # defined
 
diff -r 629cc19f543f -r 9e4950248be0 share/sushi/system/rcconf/form
--- a/share/sushi/system/rcconf/form    Wed Mar 24 18:22:47 2004 +0000
+++ b/share/sushi/system/rcconf/form    Wed Mar 24 18:47:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: form,v 1.10 2004/03/09 21:36:37 garbled Exp $
+# $NetBSD: form,v 1.11 2004/03/24 18:47:08 garbled Exp $
 escript:30,script2,rc_rcorder_flags    Flags to rcorder at boot
 script:script1,do_rcshutdown   Run /etc/rc.shutdown?
 escript:30,script2,rcshutdown_rcorder_flags    Flags to rcorder at shutdown
@@ -42,7 +42,7 @@
 script:script1,ntpdate         Run ntpdate at boot?
 escript:30,script2,ntpdate_flags       Flags for ntpdate.
 escript:30,script2,ppp_peers   /etc/ppp/peers to call
-list:host,autohost,router      IPv6 mode
+script:script4 IPv6 mode
 script:script1,ip6sitelocal    IPv6 sitelocal addresses
 script:script1,rtsol           IPv6 autoconfig on non routers
 escript:30,script2,rtsol_flags Flags to pass to rtsol
diff -r 629cc19f543f -r 9e4950248be0 share/sushi/system/rcconf/script4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/sushi/system/rcconf/script4 Wed Mar 24 18:47:08 2004 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $NetBSD: script4,v 1.1 2004/03/24 18:47:08 garbled Exp $
+. /etc/rc.conf
+
+if [ -z "$ip6mode" ]; then
+       ip6mode=host
+fi
+
+
+echo "$ip6mode"
+MODES="host autohost router"
+for n in $MODES;
+do
+       if [ "$n" != "$ip6mode" ]; then
+               echo $n
+       fi
+done