diff options
| author | brian <brian@FreeBSD.org> | 2001-06-03 12:26:56 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2001-06-03 12:26:56 +0000 |
| commit | fd81208991819c5d3de2fc0a79345fc30c8ebfd1 (patch) | |
| tree | 997ec4b91f017c4a1afaabd0cb1dbb9b43072ba4 /etc/defaults/rc.conf | |
| parent | f1767c79aee201f2616b72d7964bab85f4c1012f (diff) | |
| download | FreeBSD-src-fd81208991819c5d3de2fc0a79345fc30c8ebfd1.zip FreeBSD-src-fd81208991819c5d3de2fc0a79345fc30c8ebfd1.tar.gz | |
Move gif_interfaces from an IP6 option to a regular IP option.
PR: 26543
Submitted by: Brooks Davis <brooks@one-eyed-alien.net>
MFC after: 3 weeks
Diffstat (limited to 'etc/defaults/rc.conf')
| -rw-r--r-- | etc/defaults/rc.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 51266f9..2d2ce36 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -93,6 +93,11 @@ ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. 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 +257,6 @@ mroute6d_enable="NO" # Do IPv6 multicast routing. 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. |
