diff options
Diffstat (limited to 'templates')
| -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 | ||||
| -rw-r--r-- | templates/system/login/node.def | 3 | ||||
| -rw-r--r-- | templates/system/login/radius-server/node.def | 1 | ||||
| -rw-r--r-- | templates/system/login/user/node.def | 1 |
6 files changed, 15 insertions, 12 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) diff --git a/templates/system/login/node.def b/templates/system/login/node.def index 66ac660c..9b24a71f 100644 --- a/templates/system/login/node.def +++ b/templates/system/login/node.def @@ -1,2 +1,3 @@ help: Set user access -delete: echo 'User root cannot be deleted' 1>&2; exit 1 +delete: echo 'All login methods can not be deleted' 1>&2; exit 1 +end: /opt/vyatta/sbin/vyatta_update_login.pl diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius-server/node.def index f74cc568..137a92a0 100644 --- a/templates/system/login/radius-server/node.def +++ b/templates/system/login/radius-server/node.def @@ -4,4 +4,3 @@ help: Set radius server authentication commit:expression: $VAR(port) != "" && $VAR(secret) != "" && $VAR(timeout) != "" ; "Port, secret, and timeout must be specified for Radius" -end: /opt/vyatta/sbin/vyatta_update_radius.pl diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def index 26625b7f..d23a397f 100644 --- a/templates/system/login/user/node.def +++ b/templates/system/login/user/node.def @@ -7,4 +7,3 @@ commit:expression: $VAR(authentication/encrypted-password) != "" ; "user password must be specified" syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$" ; "invalid user name $VAR(@)" -end: /opt/vyatta/sbin/vyatta_update_login.pl |