diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-03-28 18:13:10 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-03-28 18:13:10 -0500 |
| commit | 2b7b40b018efdf0fbad1a2c1e37f70da30aa3d8b (patch) | |
| tree | 8932016c6efb5b4c1b3537e34d0be19600857bc3 /templates/interfaces/tunnel | |
| parent | c2171b19ab262e2c39af13145dae2184f5879fb5 (diff) | |
| download | vyatta-cfg-system-2b7b40b018efdf0fbad1a2c1e37f70da30aa3d8b.tar.gz vyatta-cfg-system-2b7b40b018efdf0fbad1a2c1e37f70da30aa3d8b.zip | |
Bugfix 6958: only call cleanup script for tunnel modules on the last sibling deletion
Diffstat (limited to 'templates/interfaces/tunnel')
| -rw-r--r-- | templates/interfaces/tunnel/node.def | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index f4d53c1a..c8670a16 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -39,8 +39,11 @@ delete: ip link set $VAR(@) down else ip tunnel del $VAR(@) mode $VAR(./encapsulation/@) fi -end: if [ ${COMMIT_ACTION} = "DELETE" ]; then - /opt/vyatta/sbin/vyatta-tunnel-cleanup - 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 |