Get rid of vyatta-vtysh

For SELinux policy, changing vyatta-quagga to use standard path values.
This means not having to change policies.

16 files changed, 33 insertions, 41 deletions

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:
  <text>             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/) == ""); \