diff options
author | Bill Nottingham <notting@redhat.com> | 2009-01-27 12:06:18 -0500 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2009-05-04 16:05:05 +0200 |
commit | 7400d23a7a5b42571461c6377f4a1349e98f8ef4 (patch) | |
tree | 681bc8e3658d1cee6b9fa3a7ca6ec440ca1c56b6 /rc.d | |
parent | daaacbb00de1df2464ce4e7ce29c109071923104 (diff) | |
download | initscripts-7400d23a7a5b42571461c6377f4a1349e98f8ef4.tar initscripts-7400d23a7a5b42571461c6377f4a1349e98f8ef4.tar.gz initscripts-7400d23a7a5b42571461c6377f4a1349e98f8ef4.tar.bz2 initscripts-7400d23a7a5b42571461c6377f4a1349e98f8ef4.tar.xz initscripts-7400d23a7a5b42571461c6377f4a1349e98f8ef4.zip |
Bring up ipsec interfaces last. (#481733)
Diffstat (limited to 'rc.d')
-rwxr-xr-x | rc.d/init.d/network | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 015120b7..4f917753 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -89,7 +89,7 @@ case "$1" in esac vlaninterfaces="" - cipeinterfaces="" + vpninterfaces="" xdslinterfaces="" bridgeinterfaces="" @@ -103,7 +103,7 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then - cipeinterfaces="$cipeinterfaces $i" + vpninterfaces="$vpninterfaces $i" continue fi if [ "$TYPE" = "xDSL" ]; then @@ -115,6 +115,10 @@ case "$1" in bridgeinterfaces="$bridgeinterfaces $i" continue fi + if [ "$TYPE" = "IPSEC" ]; then + vpninterfaces="$vpninterfaces $i" + continue + fi if [ "${DEVICE%%.*}" != "$DEVICE" -o "${DEVICE##vlan}" != "$DEVICE" ] ; then vlaninterfaces="$vlaninterfaces $i" @@ -139,8 +143,8 @@ case "$1" in rc=$((rc+$?)) done - # Bring up xDSL and CIPE interfaces - for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces $cipeinterfaces ; do + # Bring up xDSL and VPN interfaces + for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces $vpninterfaces ; do if ! LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then # If we're in confirmation mode, get user confirmation. if [ -f /var/run/confirm ]; then @@ -201,13 +205,13 @@ case "$1" in fi vlaninterfaces="" - cipeinterfaces="" + vpninterfaces="" xdslinterfaces="" bridgeinterfaces="" remaining="" rc=0 - # get list of bonding, cipe, and xdsl interfaces + # get list of bonding, vpn, and xdsl interfaces for i in $interfaces; do unset DEVICE TYPE eval $(LANG=C fgrep "DEVICE=" ifcfg-$i) @@ -216,7 +220,11 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then - cipeinterfaces="$cipeinterfaces $i" + vpninterfaces="$vpninterfaces $i" + continue + fi + if [ "$TYPE" = "IPSEC" ]; then + vpninterfaces="$vpninterfaces $i" continue fi if [ "$TYPE" = "Bridge" ]; then @@ -235,7 +243,7 @@ case "$1" in remaining="$remaining $i" done - for i in $cipeinterfaces $xdslinterfaces $bridgeinterfaces $vlaninterfaces $remaining; do + for i in $vpninterfaces $xdslinterfaces $bridgeinterfaces $vlaninterfaces $remaining; do (. ifcfg-$i if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi |