diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-05-25 17:29:54 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-05-25 17:29:54 -0700 |
commit | d61ce5aa1c7b2a8e9d77d2a3e34f9b996ed6a6fb (patch) | |
tree | f1583aa63a0929532e8f120d40d1b167feffc797 /templates/interfaces/tunnel/node.def | |
parent | 31f3d30599b976bfd033b7c69b2aa1394541d879 (diff) | |
parent | 29e419548be1390824eb8e0bf29c57a00c444359 (diff) | |
download | vyatta-cfg-quagga-d61ce5aa1c7b2a8e9d77d2a3e34f9b996ed6a6fb.tar.gz vyatta-cfg-quagga-d61ce5aa1c7b2a8e9d77d2a3e34f9b996ed6a6fb.zip |
Merge branch 'napa' of suva.vyatta.com:/git/vyatta-cfg-system into napa
Diffstat (limited to 'templates/interfaces/tunnel/node.def')
-rw-r--r-- | templates/interfaces/tunnel/node.def | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index c8670a16..669f7636 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -40,10 +40,7 @@ delete: ip link set $VAR(@) down ip tunnel del $VAR(@) mode $VAR(./encapsulation/@) fi -end: if [ "$COMMIT_SIBLING_POSITION" = "LAST" ] || \ - [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then - if [ ${COMMIT_ACTION} = "DELETE" ]; then - /opt/vyatta/sbin/vyatta-tunnel-cleanup - fi - fi +end: if [ "${COMMIT_ACTION}" == DELETE ]; then + /opt/vyatta/sbin/vyatta-tunnel-cleanup $VAR(@) + fi |