diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-01-27 12:06:18 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2009-03-11 13:36:42 -0400 |
| commit | c854f7cdbe8566fa6670299bc46bcc8ed5dccf41 (patch) | |
| tree | 09c54a2ca16d63932a8dd62c47620d1e3b370e2e | |
| parent | a81f63d3b4be10fddd5f8e1f3df9bb149cabf422 (diff) | |
| download | initscripts-c854f7cdbe8566fa6670299bc46bcc8ed5dccf41.tar initscripts-c854f7cdbe8566fa6670299bc46bcc8ed5dccf41.tar.gz initscripts-c854f7cdbe8566fa6670299bc46bcc8ed5dccf41.tar.bz2 initscripts-c854f7cdbe8566fa6670299bc46bcc8ed5dccf41.tar.xz initscripts-c854f7cdbe8566fa6670299bc46bcc8ed5dccf41.zip | |
Bring up ipsec interfaces last. (#481733)
| -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 94fcc628..a7b92e8f 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -88,7 +88,7 @@ case "$1" in esac vlaninterfaces="" - cipeinterfaces="" + vpninterfaces="" xdslinterfaces="" bridgeinterfaces="" @@ -102,7 +102,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 @@ -114,6 +114,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" @@ -137,8 +141,8 @@ case "$1" in action $"Bringing up interface $i: " ./ifup $i boot 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 @@ -194,12 +198,12 @@ case "$1" in fi vlaninterfaces="" - cipeinterfaces="" + vpninterfaces="" xdslinterfaces="" bridgeinterfaces="" remaining="" - # 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) @@ -208,7 +212,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 @@ -227,7 +235,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 |