aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Freire <rfreire@redhat.com>2016-03-05 21:07:54 -0300
committerDee'Kej <deekej@linuxmail.org>2016-11-15 14:26:48 +0100
commita2ecd685d60fd013b121e78aebd5558121f4fb5e (patch)
treea2ecb28c2441be4ecef07c06c2af5c40d0a49db3
parent9faa8ba45dbc4a43eac5723e41bea248057e9a1e (diff)
downloadinitscripts-a2ecd685d60fd013b121e78aebd5558121f4fb5e.tar
initscripts-a2ecd685d60fd013b121e78aebd5558121f4fb5e.tar.gz
initscripts-a2ecd685d60fd013b121e78aebd5558121f4fb5e.tar.bz2
initscripts-a2ecd685d60fd013b121e78aebd5558121f4fb5e.tar.xz
initscripts-a2ecd685d60fd013b121e78aebd5558121f4fb5e.zip
network: Treat other tunnel interfaces, fixes ifdown stage
This patch is a complement of commit 5e9dd516e2e0 ("add bonding & xDSL to the list of devices brought up afterwards (#97030,#91399)"), ensuring that GRE and IPIP tunnels are brought up after base interfaces are up, and bring down before the underlying interface goes down. Signed-off-by: Rodrigo Freire <rfreire@redhat.com> Resolves: RHBZ #1315018
-rwxr-xr-xrc.d/init.d/network10
1 files changed, 10 insertions, 0 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index cbb9ddf7..6bcbb7db 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -98,6 +98,11 @@ case "$1" in
continue
fi
+ if [ "$TYPE" = "IPSEC" ] || [ "$TYPE" = "IPIP" ] || [ "$TYPE" = "GRE" ]; then
+ vpninterfaces="$vpninterfaces $i"
+ continue
+ fi
+
if [ "${DEVICE%%.*}" != "$DEVICE" -o "${DEVICE##vlan}" != "$DEVICE" ] ; then
vlaninterfaces="$vlaninterfaces $i"
continue
@@ -187,6 +192,11 @@ case "$1" in
if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi
+ if [ "$TYPE" = "IPSEC" ] || [ "$TYPE" = "IPIP" ] || [ "$TYPE" = "GRE" ]; then
+ vpninterfaces="$vpninterfaces $i"
+ continue
+ fi
+
if [ "$TYPE" = "Bridge" ]; then
bridgeinterfaces="$bridgeinterfaces $i"
continue