diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-05 15:30:03 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-05 15:30:03 -0800 |
| commit | 7e018e496706667c3c0d9cc074d479b3fc445bd9 (patch) | |
| tree | 94635b213133edb6c3724d0bf7469b5588db386d /interface-templates/ip/rip | |
| parent | 25d3ee90522b1056d9a25735c3e0c89e7b1eeae1 (diff) | |
| download | vyatta-cfg-quagga-7e018e496706667c3c0d9cc074d479b3fc445bd9.tar.gz vyatta-cfg-quagga-7e018e496706667c3c0d9cc074d479b3fc445bd9.zip | |
Get rid of vyatta-vtysh
For SELinux policy, changing vyatta-quagga to use standard path values.
This means not having to change policies.
Diffstat (limited to 'interface-templates/ip/rip')
4 files changed, 8 insertions, 12 deletions
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/) == ""); \ |