aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-02-20 09:47:00 -0500
committerBill Nottingham <notting@redhat.com>2009-02-20 09:47:00 -0500
commitce4d036fcaebe759bd5edc2026c34bae5d8bf853 (patch)
treef524cdd09b1bfa07a636e395618be10d463e5441
parent252c7c1bf9779dbdba94abe47350c866ba8ca421 (diff)
downloadinitscripts-ce4d036fcaebe759bd5edc2026c34bae5d8bf853.tar
initscripts-ce4d036fcaebe759bd5edc2026c34bae5d8bf853.tar.gz
initscripts-ce4d036fcaebe759bd5edc2026c34bae5d8bf853.tar.bz2
initscripts-ce4d036fcaebe759bd5edc2026c34bae5d8bf853.tar.xz
initscripts-ce4d036fcaebe759bd5edc2026c34bae5d8bf853.zip
Add compatiblity for openNHRP tunnels (#486559, <claude.tompers@ieee.lu>)
ifup-tunnel fails for openNHRP type tunnels because the PEER_OUTER_IPADDR is generated dynamically and therefore not given for this type of tunnels. openNHRP tunnels also need a key, this is also added.
-rwxr-xr-xsysconfig/network-scripts/ifup-tunnel3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel
index fc9c2f06..017dbf5c 100755
--- a/sysconfig/network-scripts/ifup-tunnel
+++ b/sysconfig/network-scripts/ifup-tunnel
@@ -61,7 +61,8 @@ fi
# The outer addresses are those of the underlying (public) network.
/sbin/ip tunnel add "$DEVICE" mode "$MODE" \
${MY_OUTER_IPADDR:+local "$MY_OUTER_IPADDR"} \
- remote "$PEER_OUTER_IPADDR" ${TTL:+ttl "$TTL"}
+ ${PEER_OUTER_IPADDR:+remote "$PEER_OUTER_IPADDR"} \
+ ${KEY:+key "$KEY"} ${TTL:+ttl "$TTL"}
if [ -n "$MTU" ]; then
/sbin/ip link set "$DEVICE" mtu "$MTU"