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
This commit is contained in:
brian
parent
f1767c79ae
commit
fd81208991
@ -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.
|
||||
|
||||
@ -129,6 +129,9 @@ network_pass1() {
|
||||
fi
|
||||
done
|
||||
|
||||
# gifconfig
|
||||
network_gif_setup
|
||||
|
||||
# Set up all the network interfaces, calling startup scripts if needed
|
||||
#
|
||||
case ${network_interfaces} in
|
||||
@ -751,6 +754,26 @@ network_pass4() {
|
||||
network_pass4_done=YES
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
convert_host_conf() {
|
||||
host_conf=$1; shift;
|
||||
nsswitch_conf=$1; shift;
|
||||
|
||||
@ -129,6 +129,9 @@ network_pass1() {
|
||||
fi
|
||||
done
|
||||
|
||||
# gifconfig
|
||||
network_gif_setup
|
||||
|
||||
# Set up all the network interfaces, calling startup scripts if needed
|
||||
#
|
||||
case ${network_interfaces} in
|
||||
@ -751,6 +754,26 @@ network_pass4() {
|
||||
network_pass4_done=YES
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
convert_host_conf() {
|
||||
host_conf=$1; shift;
|
||||
nsswitch_conf=$1; shift;
|
||||
|
||||
@ -129,6 +129,9 @@ network_pass1() {
|
||||
fi
|
||||
done
|
||||
|
||||
# gifconfig
|
||||
network_gif_setup
|
||||
|
||||
# Set up all the network interfaces, calling startup scripts if needed
|
||||
#
|
||||
case ${network_interfaces} in
|
||||
@ -751,6 +754,26 @@ network_pass4() {
|
||||
network_pass4_done=YES
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
convert_host_conf() {
|
||||
host_conf=$1; shift;
|
||||
nsswitch_conf=$1; shift;
|
||||
|
||||
@ -129,6 +129,9 @@ network_pass1() {
|
||||
fi
|
||||
done
|
||||
|
||||
# gifconfig
|
||||
network_gif_setup
|
||||
|
||||
# Set up all the network interfaces, calling startup scripts if needed
|
||||
#
|
||||
case ${network_interfaces} in
|
||||
@ -751,6 +754,26 @@ network_pass4() {
|
||||
network_pass4_done=YES
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
convert_host_conf() {
|
||||
host_conf=$1; shift;
|
||||
nsswitch_conf=$1; shift;
|
||||
|
||||
@ -129,6 +129,9 @@ network_pass1() {
|
||||
fi
|
||||
done
|
||||
|
||||
# gifconfig
|
||||
network_gif_setup
|
||||
|
||||
# Set up all the network interfaces, calling startup scripts if needed
|
||||
#
|
||||
case ${network_interfaces} in
|
||||
@ -751,6 +754,26 @@ network_pass4() {
|
||||
network_pass4_done=YES
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
convert_host_conf() {
|
||||
host_conf=$1; shift;
|
||||
nsswitch_conf=$1; shift;
|
||||
|
||||
@ -125,9 +125,6 @@ network6_pass1() {
|
||||
;;
|
||||
esac
|
||||
|
||||
# gifconfig
|
||||
network6_gif_setup
|
||||
|
||||
# setting up interfaces
|
||||
network6_interface_setup $ipv6_network_interfaces
|
||||
|
||||
@ -339,26 +336,6 @@ network6_interface_setup() {
|
||||
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() {
|
||||
case ${stf_interface_ipv4addr} in
|
||||
[Nn][Oo] | '')
|
||||
|
||||
@ -129,6 +129,9 @@ network_pass1() {
|
||||
fi
|
||||
done
|
||||
|
||||
# gifconfig
|
||||
network_gif_setup
|
||||
|
||||
# Set up all the network interfaces, calling startup scripts if needed
|
||||
#
|
||||
case ${network_interfaces} in
|
||||
@ -751,6 +754,26 @@ network_pass4() {
|
||||
network_pass4_done=YES
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
convert_host_conf() {
|
||||
host_conf=$1; shift;
|
||||
nsswitch_conf=$1; shift;
|
||||
|
||||
@ -129,6 +129,9 @@ network_pass1() {
|
||||
fi
|
||||
done
|
||||
|
||||
# gifconfig
|
||||
network_gif_setup
|
||||
|
||||
# Set up all the network interfaces, calling startup scripts if needed
|
||||
#
|
||||
case ${network_interfaces} in
|
||||
@ -751,6 +754,26 @@ network_pass4() {
|
||||
network_pass4_done=YES
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
convert_host_conf() {
|
||||
host_conf=$1; shift;
|
||||
nsswitch_conf=$1; shift;
|
||||
|
||||
@ -125,9 +125,6 @@ network6_pass1() {
|
||||
;;
|
||||
esac
|
||||
|
||||
# gifconfig
|
||||
network6_gif_setup
|
||||
|
||||
# setting up interfaces
|
||||
network6_interface_setup $ipv6_network_interfaces
|
||||
|
||||
@ -339,26 +336,6 @@ network6_interface_setup() {
|
||||
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() {
|
||||
case ${stf_interface_ipv4addr} in
|
||||
[Nn][Oo] | '')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user