From 7e018e496706667c3c0d9cc074d479b3fc445bd9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 5 Mar 2010 15:30:03 -0800 Subject: Get rid of vyatta-vtysh For SELinux policy, changing vyatta-quagga to use standard path values. This means not having to change policies. --- .../ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def | 6 +++--- interface-templates/ip/ospf/authentication/md5/node.def | 8 ++------ .../ip/ospf/authentication/plaintext-password/node.def | 4 ++-- interface-templates/ip/ospf/bandwidth/node.def | 4 ++-- interface-templates/ip/ospf/cost/node.def | 4 ++-- interface-templates/ip/ospf/dead-interval/node.def | 4 ++-- interface-templates/ip/ospf/hello-interval/node.def | 4 ++-- interface-templates/ip/ospf/mtu-ignore/node.def | 4 ++-- interface-templates/ip/ospf/network/node.def | 4 ++-- interface-templates/ip/ospf/priority/node.def | 4 ++-- interface-templates/ip/ospf/retransmit-interval/node.def | 4 ++-- interface-templates/ip/ospf/transmit-delay/node.def | 4 ++-- .../ip/rip/authentication/md5/node.tag/password/node.def | 4 ++-- .../ip/rip/authentication/plaintext-password/node.def | 6 ++---- interface-templates/ip/rip/split-horizon/disable/node.def | 6 ++---- interface-templates/ip/rip/split-horizon/poison-reverse/node.def | 4 ++-- interface-templates/ipv6/ospfv3/cost/node.def | 2 +- interface-templates/ipv6/ospfv3/dead-interval/node.def | 4 ++-- interface-templates/ipv6/ospfv3/hello-interval/node.def | 4 ++-- interface-templates/ipv6/ospfv3/ifmtu/node.def | 4 ++-- interface-templates/ipv6/ospfv3/instance-id/node.def | 4 ++-- interface-templates/ipv6/ospfv3/passive/node.def | 4 ++-- interface-templates/ipv6/ospfv3/priority/node.def | 4 ++-- interface-templates/ipv6/ospfv3/retransmit-interval/node.def | 4 ++-- interface-templates/ipv6/ospfv3/transmit-delay/node.def | 4 ++-- interface-templates/ipv6/ripng/split-horizon/disable/node.def | 4 ++-- .../ipv6/ripng/split-horizon/poison-reverse/node.def | 4 ++-- 27 files changed, 54 insertions(+), 62 deletions(-) (limited to 'interface-templates') diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 2cae238a..97d1f693 100644 --- a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -9,16 +9,16 @@ comp_help: possible completions: # If this node is created create: - vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ + vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ip ospf message-digest-key $VAR(../@) md5 $VAR(@)" # If the value of this node is changed update: - vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ + vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip ospf message-digest-key $VAR(../@)" \ -c "ip ospf message-digest-key $VAR(../@) md5 $VAR(@)" # If this node is deleted delete: - vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ + vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip ospf message-digest-key $VAR(../@)" diff --git a/interface-templates/ip/ospf/authentication/md5/node.def b/interface-templates/ip/ospf/authentication/md5/node.def index 1fcf3e64..1f3c8519 100644 --- a/interface-templates/ip/ospf/authentication/md5/node.def +++ b/interface-templates/ip/ospf/authentication/md5/node.def @@ -1,14 +1,10 @@ help: Set MD5 key id -create: - vyatta-vtysh \ - -c "configure terminal" \ +create: vtysh -c "configure terminal" \ -c "interface $IFNAME" \ -c "no ip ospf authentication" \ -c "ip ospf authentication message-digest" -delete: - vyatta-vtysh \ - -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "interface $IFNAME" \ -c "no ip ospf authentication" diff --git a/interface-templates/ip/ospf/authentication/plaintext-password/node.def b/interface-templates/ip/ospf/authentication/plaintext-password/node.def index 4b31f0d8..41ead9f0 100644 --- a/interface-templates/ip/ospf/authentication/plaintext-password/node.def +++ b/interface-templates/ip/ospf/authentication/plaintext-password/node.def @@ -1,10 +1,10 @@ type: txt help: Configure plain text password syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$" ; "Password must be 8 characters or less" -update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +update:vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip ospf authentication " -c "ip ospf authentication " \ -c "ip ospf authentication-key $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete:vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip ospf authentication " -c "no ip ospf authentication-key" comp_help: possible completions: Plain text password (8 characters or less) diff --git a/interface-templates/ip/ospf/bandwidth/node.def b/interface-templates/ip/ospf/bandwidth/node.def index 1f77079f..64c3801d 100644 --- a/interface-templates/ip/ospf/bandwidth/node.def +++ b/interface-templates/ip/ospf/bandwidth/node.def @@ -1,7 +1,7 @@ type: u32 help: Set bandwidth for specified interface (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; "Must be between 1-10000000" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "bandwidth $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no bandwidth" +update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "bandwidth $VAR(@)" +delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "no bandwidth" comp_help: possible completions: <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost) diff --git a/interface-templates/ip/ospf/cost/node.def b/interface-templates/ip/ospf/cost/node.def index da8b545e..b5a1baed 100644 --- a/interface-templates/ip/ospf/cost/node.def +++ b/interface-templates/ip/ospf/cost/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:vyatta-vtysh -c "configure terminal" \ +update:vtysh -c "configure terminal" \ -c "interface $IFNAME" \ -c "ip ospf cost $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" \ +delete:vtysh -c "configure terminal" \ -c "interface $IFNAME" \ -c "no ip ospf cost" comp_help: possible completions: diff --git a/interface-templates/ip/ospf/dead-interval/node.def b/interface-templates/ip/ospf/dead-interval/node.def index feed7189..28d63232 100644 --- a/interface-templates/ip/ospf/dead-interval/node.def +++ b/interface-templates/ip/ospf/dead-interval/node.def @@ -2,7 +2,7 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf dead-interval $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf dead-interval" +update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf dead-interval $VAR(@)" +delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf dead-interval" comp_help: possible completions: <1-65535> Seconds (default 40) diff --git a/interface-templates/ip/ospf/hello-interval/node.def b/interface-templates/ip/ospf/hello-interval/node.def index 9da68fb1..6b777b62 100644 --- a/interface-templates/ip/ospf/hello-interval/node.def +++ b/interface-templates/ip/ospf/hello-interval/node.def @@ -2,7 +2,7 @@ type: u32 help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf hello-interval $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf hello-interval" +update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf hello-interval $VAR(@)" +delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf hello-interval" comp_help: possible completions: <1-65535> Seconds (default 10) diff --git a/interface-templates/ip/ospf/mtu-ignore/node.def b/interface-templates/ip/ospf/mtu-ignore/node.def index e2c897e7..b5250b0a 100644 --- a/interface-templates/ip/ospf/mtu-ignore/node.def +++ b/interface-templates/ip/ospf/mtu-ignore/node.def @@ -1,3 +1,3 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf mtu-ignore" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf mtu-ignore" +create:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf mtu-ignore" +delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf mtu-ignore" diff --git a/interface-templates/ip/ospf/network/node.def b/interface-templates/ip/ospf/network/node.def index bac9d333..806987be 100644 --- a/interface-templates/ip/ospf/network/node.def +++ b/interface-templates/ip/ospf/network/node.def @@ -2,8 +2,8 @@ type: txt help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf network $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf network" +update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf network $VAR(@)" +delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf network" comp_help: possible completions: broadcast Set broadcast network type non-broadcast Set non-broadcast network type diff --git a/interface-templates/ip/ospf/priority/node.def b/interface-templates/ip/ospf/priority/node.def index c995eeb0..bd59276c 100644 --- a/interface-templates/ip/ospf/priority/node.def +++ b/interface-templates/ip/ospf/priority/node.def @@ -2,7 +2,7 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf priority $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf priority" +update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf priority $VAR(@)" +delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf priority" comp_help: possible completions: <0-255> Priority (default 1) diff --git a/interface-templates/ip/ospf/retransmit-interval/node.def b/interface-templates/ip/ospf/retransmit-interval/node.def index 41dbe810..d0ccfab5 100644 --- a/interface-templates/ip/ospf/retransmit-interval/node.def +++ b/interface-templates/ip/ospf/retransmit-interval/node.def @@ -2,9 +2,9 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +update: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ip ospf retransmit-interval $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip ospf retransmit-interval" comp_help: possible completions: <3-65535> Seconds (default 5) diff --git a/interface-templates/ip/ospf/transmit-delay/node.def b/interface-templates/ip/ospf/transmit-delay/node.def index 761424da..bb22659b 100644 --- a/interface-templates/ip/ospf/transmit-delay/node.def +++ b/interface-templates/ip/ospf/transmit-delay/node.def @@ -2,7 +2,7 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf transmit-delay $VAR(@)" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf transmit-delay" +update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf transmit-delay $VAR(@)" +delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf transmit-delay" comp_help: possible completions: <1-65535> Seconds (default 1) diff --git a/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def index 15e09b12..8ee5c39f 100644 --- a/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def +++ b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def @@ -2,14 +2,14 @@ type: txt help: Set authentication password syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$" ; "MD5 key must be 16 characters or less" -update:vyatta-vtysh \ +update:vtysh \ -c "configure terminal" -c "interface $IFNAME" \ -c "ip rip authentication mode md5" \ -c "ip rip authentication key-chain $IFNAME-rip" \ -c "key chain $IFNAME-rip" -c "key $VAR(../@)" \ -c "key-string $VAR(@)" -delete:vyatta-vtysh --noerror \ +delete:vtysh --noerror \ -c "configure terminal" -c "interface $IFNAME" \ -c "no ip rip authentication mode md5" \ -c "no ip rip authentication key-chain $IFNAME-rip" \ diff --git a/interface-templates/ip/rip/authentication/plaintext-password/node.def b/interface-templates/ip/rip/authentication/plaintext-password/node.def index b223e61c..addf2473 100644 --- a/interface-templates/ip/rip/authentication/plaintext-password/node.def +++ b/interface-templates/ip/rip/authentication/plaintext-password/node.def @@ -3,13 +3,11 @@ help: Set plain text password syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$" ; "Password must be 16 characters or less" commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: vyatta-vtysh \ - -c "configure terminal" -c "interface $IFNAME" \ +update: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ - -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip rip authentication mode" \ -c "no ip rip authentication string $VAR(@)" diff --git a/interface-templates/ip/rip/split-horizon/disable/node.def b/interface-templates/ip/rip/split-horizon/disable/node.def index 55e8a0d1..67ffe7aa 100644 --- a/interface-templates/ip/rip/split-horizon/disable/node.def +++ b/interface-templates/ip/rip/split-horizon/disable/node.def @@ -1,9 +1,7 @@ help: Disable split horizon on specified interface -create:vyatta-vtysh \ - -c "configure terminal" -c "interface $IFNAME" \ +create: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip rip split-horizon" -delete:vyatta-vtysh \ - -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ip rip split-horizon" commit:expression: ($VAR(../poison-reverse/) == ""); \ diff --git a/interface-templates/ip/rip/split-horizon/poison-reverse/node.def b/interface-templates/ip/rip/split-horizon/poison-reverse/node.def index 07cb8944..47c47012 100644 --- a/interface-templates/ip/rip/split-horizon/poison-reverse/node.def +++ b/interface-templates/ip/rip/split-horizon/poison-reverse/node.def @@ -1,8 +1,8 @@ help: Enable poison reverse for split-horizon -create:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +create:vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ip rip split-horizon poisoned-reverse" -delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete:vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ip rip split-horizon" -c "ip rip split-horizon " commit:expression: ($VAR(../disable/) == ""); \ diff --git a/interface-templates/ipv6/ospfv3/cost/node.def b/interface-templates/ipv6/ospfv3/cost/node.def index 8640f859..556f0d06 100644 --- a/interface-templates/ipv6/ospfv3/cost/node.def +++ b/interface-templates/ipv6/ospfv3/cost/node.def @@ -2,6 +2,6 @@ type: u32 help: Set interface cost default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 cost $VAR(@)" +update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 cost $VAR(@)" comp_help: possible completions: <1-65535> Set cost diff --git a/interface-templates/ipv6/ospfv3/dead-interval/node.def b/interface-templates/ipv6/ospfv3/dead-interval/node.def index 45b64376..66577760 100644 --- a/interface-templates/ipv6/ospfv3/dead-interval/node.def +++ b/interface-templates/ipv6/ospfv3/dead-interval/node.def @@ -2,9 +2,9 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +update: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 dead-interval $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 dead-interval 40" comp_help: possible completions: <1-65535> Seconds (default 40) diff --git a/interface-templates/ipv6/ospfv3/hello-interval/node.def b/interface-templates/ipv6/ospfv3/hello-interval/node.def index d0c07c82..5e74cfb5 100644 --- a/interface-templates/ipv6/ospfv3/hello-interval/node.def +++ b/interface-templates/ipv6/ospfv3/hello-interval/node.def @@ -2,9 +2,9 @@ type: u32 help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +update: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 hello-interval $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 hello-interval 10" comp_help: possible completions: <1-65535> Seconds (default 10) diff --git a/interface-templates/ipv6/ospfv3/ifmtu/node.def b/interface-templates/ipv6/ospfv3/ifmtu/node.def index c9455838..5c2939da 100644 --- a/interface-templates/ipv6/ospfv3/ifmtu/node.def +++ b/interface-templates/ipv6/ospfv3/ifmtu/node.def @@ -1,7 +1,7 @@ type: u32 help: Set interface MTU syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 ifmtu $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 ifmtu" +update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 ifmtu $VAR(@)" +delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 ifmtu" comp_help: possible completions: <1-65535> Set interface MTU diff --git a/interface-templates/ipv6/ospfv3/instance-id/node.def b/interface-templates/ipv6/ospfv3/instance-id/node.def index b2bb5bf6..dfe4dade 100644 --- a/interface-templates/ipv6/ospfv3/instance-id/node.def +++ b/interface-templates/ipv6/ospfv3/instance-id/node.def @@ -2,7 +2,7 @@ type: u32 help: Set instance-id for this interface default: 0 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 instance-id $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 instance-id 0" +update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 instance-id $VAR(@)" +delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 instance-id 0" comp_help: possible completions: <0-255> Instance Id (default 0) diff --git a/interface-templates/ipv6/ospfv3/passive/node.def b/interface-templates/ipv6/ospfv3/passive/node.def index a01ee538..7c3ff0b5 100644 --- a/interface-templates/ipv6/ospfv3/passive/node.def +++ b/interface-templates/ipv6/ospfv3/passive/node.def @@ -1,3 +1,3 @@ help: Disable forming of adjacency on this interface -create: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 passive" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 passive" +create: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 passive" +delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 passive" diff --git a/interface-templates/ipv6/ospfv3/priority/node.def b/interface-templates/ipv6/ospfv3/priority/node.def index a537ad99..79532542 100644 --- a/interface-templates/ipv6/ospfv3/priority/node.def +++ b/interface-templates/ipv6/ospfv3/priority/node.def @@ -2,7 +2,7 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 priority $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 priority 1" +update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 priority $VAR(@)" +delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 priority 1" comp_help: possible completions: <0-255> Priority (default 1) diff --git a/interface-templates/ipv6/ospfv3/retransmit-interval/node.def b/interface-templates/ipv6/ospfv3/retransmit-interval/node.def index d70dfdfb..f92a7800 100644 --- a/interface-templates/ipv6/ospfv3/retransmit-interval/node.def +++ b/interface-templates/ipv6/ospfv3/retransmit-interval/node.def @@ -2,9 +2,9 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +update: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 retransmit-interval $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 retransmit-interval 5" comp_help: possible completions: <3-65535> Seconds (default 5) diff --git a/interface-templates/ipv6/ospfv3/transmit-delay/node.def b/interface-templates/ipv6/ospfv3/transmit-delay/node.def index fee66637..ea89d87d 100644 --- a/interface-templates/ipv6/ospfv3/transmit-delay/node.def +++ b/interface-templates/ipv6/ospfv3/transmit-delay/node.def @@ -2,9 +2,9 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +update: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 transmit-delay $VAR(@)" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ospf6 transmit-delay 1" comp_help: possible completions: <1-65535> Seconds (default 1) diff --git a/interface-templates/ipv6/ripng/split-horizon/disable/node.def b/interface-templates/ipv6/ripng/split-horizon/disable/node.def index 817ae8e2..c801f7c4 100644 --- a/interface-templates/ipv6/ripng/split-horizon/disable/node.def +++ b/interface-templates/ipv6/ripng/split-horizon/disable/node.def @@ -1,6 +1,6 @@ help: Disable split horizon on specified interface -create: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ripng split-horizon" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ripng split-horizon" +create: vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ripng split-horizon" +delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ripng split-horizon" commit:expression: ($VAR(../poison-reverse/) == ""); \ "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for $IFNAME" diff --git a/interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def b/interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def index 8f17f99e..82010036 100644 --- a/interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def +++ b/interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def @@ -1,8 +1,8 @@ help: Enable poison reverse for split-horizon -create: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +create: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "ipv6 ripng split-horizon poisoned-reverse" -delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \ +delete: vtysh -c "configure terminal" -c "interface $IFNAME" \ -c "no ipv6 ripng split-horizon" -c "ipv6 ripng split-horizon" commit:expression: ($VAR(../disable/) == ""); \ -- cgit v1.2.3