Date: Fri, 1 Jun 2001 19:05:38 -0700 From: Brooks Davis <brooks@one-eyed-alien.net> To: freebsd-bugs@FreeBSD.ORG Subject: Re: conf/26543: gifconfig in rc.conf ignored if ipv6_enable off Message-ID: <20010601190538.A27737@Odin.AC.HMC.Edu> In-Reply-To: <200106020200.f52202578857@freefall.freebsd.org>; from brooks@one-eyed-alien.net on Fri, Jun 01, 2001 at 07:00:02PM -0700 References: <200106020200.f52202578857@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> I've attached a patch to the end of this message the moves gifconfig to
> /etc/rc.network from /etc/rc.network6. When applied you may see a small
> note with regard to /etc/defaults/rc.conf due to the fact that I deleted
> to unrelated changes from that diff.
I forgot, Gnats doesn't like MIME. Here's a less mangled version:
Index: rc.network
===================================================================
RCS file: /home/ncvs/src/etc/rc.network,v
retrieving revision 1.95
diff -u -r1.95 rc.network
--- rc.network 2001/05/18 18:10:02 1.95
+++ rc.network 2001/06/02 01:21:19
@@ -129,6 +129,9 @@
fi
done
+ # gifconfig
+ network_gif_setup
+
# Set up all the network interfaces, calling startup scripts if needed
#
case ${network_interfaces} in
@@ -767,3 +770,23 @@
}' < $host_conf > $nsswitch_conf
}
+network_gif_setup() {
+ case ${gif_interfaces} in
+ [Nn][Oo] | '')
+ ;;
+ *)
+ for i in ${gif_interfaces}; do
+ eval peers=\$gifconfig_$i
+ case ${peers} in
+ '')
+ continue
+ ;;
+ *)
+ gifconfig $i ${peers}
+ ;;
+ esac
+ done
+ ;;
+ esac
+}
+}
Index: rc.network6
===================================================================
RCS file: /home/ncvs/src/etc/rc.network6,v
retrieving revision 1.18
diff -u -r1.18 rc.network6
--- rc.network6 2001/04/26 17:33:37 1.18
+++ rc.network6 2001/06/02 01:21:34
@@ -125,9 +125,6 @@
;;
esac
- # gifconfig
- network6_gif_setup
-
# setting up interfaces
network6_interface_setup $ipv6_network_interfaces
@@ -337,26 +334,6 @@
ifconfig $1 up
rtsol $1
fi
-}
-
-network6_gif_setup() {
- case ${gif_interfaces} in
- [Nn][Oo] | '')
- ;;
- *)
- for i in ${gif_interfaces}; do
- eval peers=\$gifconfig_$i
- case ${peers} in
- '')
- continue
- ;;
- *)
- gifconfig $i ${peers}
- ;;
- esac
- done
- ;;
- esac
}
network6_stf_setup() {
Index: defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.108
diff -u -r1.108 rc.conf
--- defaults/rc.conf 2001/05/25 01:46:39 1.108
+++ defaults/rc.conf 2001/06/02 01:12:40
@@ -41,6 +41,8 @@
### Basic network and firewall/security options: ###
hostname="" # Set this!
+default_hostname="" # ...or this to get a hostname from DHCP.
+ # NOTE: Only set one of these.
nisdomainname="NO" # Set to NIS domain if using NIS (or NO).
dhcp_program="/sbin/dhclient" # Path to dhcp client program.
dhcp_flags="" # Additional flags to pass to dhcp client.
@@ -93,6 +95,11 @@
sppp_interfaces="" # List of sppp interfaces.
#sppp_interfaces="isp0" # example: sppp over ISDN
#spppconfig_isp0="authproto=chap myauthname=foo myauthsecret='top secret' hisauthname=some-gw hisauthsecret='another secret'"
+gif_interfaces="NO" # List of GIF tunnels (or "NO").
+#gif_interfaces="gif0 gif1" # Examples typically for a router.
+ # Choose correct tunnel addrs.
+#gifconfig_gif0="10.1.1.1 10.1.2.1" # Examples typically for a router.
+#gifconfig_gif1="10.1.1.2 10.1.2.2" # Examples typically for a router.
# User ppp configuration.
ppp_enable="NO" # Start user-ppp (or NO).
@@ -252,11 +259,6 @@
mroute6d_program="/usr/sbin/pim6dd" # Name of IPv6 multicast routing
# daemon.
mroute6d_flags="" # Flags to IPv6 multicast routing daemon.
-gif_interfaces="NO" # List of GIF tunnels (or "NO").
-#gif_interfaces="gif0 gif1" # Examples typically for a router.
- # Choose correct tunnel addrs.
-#gifconfig_gif0="10.1.1.1 10.1.2.1" # Examples typically for a router.
-#gifconfig_gif1="10.1.1.2 10.1.2.2" # Examples typically for a router.
stf_interface_ipv4addr="" # Local IPv4 addr for 6to4 IPv6 over IPv4
# tunneling interface. Specify this entry
# to enable 6to4 interface.
--
Any statement of the form "X is the one, true Y" is FALSE.
PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010601190538.A27737>