diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:06:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:06:33 -0700 |
| commit | e9bec39ea6198e36745255a1853fe03f9a65a727 (patch) | |
| tree | a2730e4e6ecf9a17a5cc654529714bc1e7b1320c /templates/interfaces | |
| parent | 15d9e99bae90169cce6da359cb45d5cda7076b71 (diff) | |
| parent | 19a38fe4d18f05d69b97c6785d5ef752479db7bb (diff) | |
| download | vyatta-cfg-system-e9bec39ea6198e36745255a1853fe03f9a65a727.tar.gz vyatta-cfg-system-e9bec39ea6198e36745255a1853fe03f9a65a727.zip | |
Merge branch 'jenner' into kenwood
Conflicts:
debian/changelog
Diffstat (limited to 'templates/interfaces')
| -rw-r--r-- | templates/interfaces/pseudo-ethernet/node.def | 2 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.def | 7 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/multicast/node.def | 13 |
3 files changed, 13 insertions, 9 deletions
diff --git a/templates/interfaces/pseudo-ethernet/node.def b/templates/interfaces/pseudo-ethernet/node.def index 1279b788..60343e7d 100644 --- a/templates/interfaces/pseudo-ethernet/node.def +++ b/templates/interfaces/pseudo-ethernet/node.def @@ -8,5 +8,5 @@ commit:expression: $VAR(link) != "" create: sudo ip link add $VAR(@) link $VAR(link/@) type macvlan || exit 1 sudo ip link set $VAR(@) up /opt/vyatta/sbin/vyatta-link-detect $VAR(@) on -delete: sudo ip link del link $VAR(@) link $VAR(link/@) +delete: sudo ip link delete dev $VAR(@) type macvlan comp_help: Enter virtual ethernet interface name (peth0 - peth999) diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index 68302461..77aaa5fa 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -16,11 +16,14 @@ create:expression: "\ if [ -n \"$VAR(./key/@)\" ]; then \ KEY=\"key $VAR(./key/@)\"; \ fi; \ - MC=\"multicast $VAR(./multicast/@) allmulticast $VAR(./multicast/@)\"; \ + if [ x$VAR(./multicast/@) == xenable ]; then \ + MC=\"multicast on allmulticast on\"; \ + fi; \ sudo ip tunnel add $VAR(@) \ local $VAR(./local-ip/@) remote $VAR(./remote-ip/@) \ mode $VAR(./encapsulation/@) $KEY; \ - sudo ip link set $VAR(@) $MC up;" ; "Error creating $VAR(@)" + sudo ip link set $VAR(@) $MC up;" ; \ + "Error creating $VAR(@)" delete:expression: "sudo ip tunnel del $VAR(@)" ; "Error deleting $VAR(@)" diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def index 2b9762e1..d7662306 100644 --- a/templates/interfaces/tunnel/node.tag/multicast/node.def +++ b/templates/interfaces/tunnel/node.tag/multicast/node.def @@ -1,13 +1,14 @@ type: txt -help: Define multicast operation over tunnel -default: "off" -syntax:expression: $VAR(@) in "on", "off"; "Must be (on, off)" +help: Set multicast operation over tunnel +default: "disable" + +syntax:expression: $VAR(@) in "enable", "disable"; \ + "Must be 'disable' or 'enable'" create:expression: "true" update:expression: "false" ; \ "Multicast should be set at tunnel creation for $VAR(../@)" comp_help: "possible completions: - on Enable Multicast - off Disable Multicast (default) - + enable Enable Multicast + disable Disable Multicast (default) |