diff options
4 files changed, 6 insertions, 6 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 diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def index 390d2767..c60b3adc 100644 --- a/templates/interfaces/tunnel/node.tag/local-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def @@ -1,4 +1,3 @@ -priority: 385 type: ipv4 help: Local IP address for this tunnel [REQUIRED] diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def index 8f5e2ede..505b8cf8 100644 --- a/templates/interfaces/tunnel/node.tag/multicast/node.def +++ b/templates/interfaces/tunnel/node.tag/multicast/node.def @@ -1,4 +1,3 @@ -priority: 385 type: txt help: Multicast operation over tunnel default: "disable" diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def index 85ee0285..f24397b8 100644 --- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/remote-ip/node.def @@ -1,4 +1,3 @@ -priority: 385 type: ipv4 help: Remote IP address for this tunnel [REQUIRED] update: if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then |