Get rid of vyatta-vtysh

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

11 files changed, 21 insertions, 21 deletions

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