diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-10-10 16:18:38 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-10 16:18:38 -0700 |
| commit | 92c7b72cf4cd54618d3d68f79a58b22da338c011 (patch) | |
| tree | 4c1b2482bf6a050aca7924a172921fbf2ac70bd7 | |
| parent | 8dabd42e88158993b8808587feb37785f5a9f923 (diff) | |
| parent | c4e7ac2de82e55915bf96d001667de86eba47396 (diff) | |
| download | vyatta-cfg-system-92c7b72cf4cd54618d3d68f79a58b22da338c011.tar.gz vyatta-cfg-system-92c7b72cf4cd54618d3d68f79a58b22da338c011.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into changes-john-southworth
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 25dc1420..7594483d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +vyatta-cfg-system (0.19.121) unstable; urgency=low + + [ Stephen Hemminger ] + * snmp: remove unused enterprise-mib hook + + [ Jon Andersson ] + * Bugfix 7553: Move the logic for delete from and end tag to a delete + tag + + [ John Southworth ] + + -- John Southworth <john.southworth@vyatta.com> Mon, 10 Oct 2011 16:16:33 -0500 + vyatta-cfg-system (0.19.120) unstable; urgency=low * Bugfix 7492: Reset mac address to hw-id when the mac is deleted diff --git a/templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def b/templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def index 23c7df60..f7c85768 100644 --- a/templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def +++ b/templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def @@ -1,10 +1,8 @@ help: IPv6 specific tunnel parameters -end: +delete: # set all parameters back to defaults if deleting this node - if [[ "${COMMIT_ACTION}" == "DELETE" ]]; then sudo ip -6 tunnel change $VAR(../../@) \ local $VAR(../../local-ip/@) remote $VAR(../../remote-ip/@) \ hoplimit 64 encaplimit 4 tclass 0x00 flowlabel 0x00000 \ mode $VAR(../../encapsulation/@) - fi |