Get rid of vyatta-vtysh

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

22 files changed, 46 insertions, 46 deletions

diff --git a/templates/protocols/ripng/aggregate-address/node.def b/templates/protocols/ripng/aggregate-address/node.def
index edd739b8..5532eb83 100644
--- a/templates/protocols/ripng/aggregate-address/node.def
+++ b/templates/protocols/ripng/aggregate-address/node.def
@@ -4,10 +4,10 @@ help: Set aggregate RIPng route announcement
 
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
-create: vyatta-vtysh -c "configure terminal" \
+create: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "aggregate-address $VAR(@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no aggregate-address $VAR(@)"
diff --git a/templates/protocols/ripng/default-information/originate/node.def b/templates/protocols/ripng/default-information/originate/node.def
index 34d60cd7..eb392758 100644
--- a/templates/protocols/ripng/default-information/originate/node.def
+++ b/templates/protocols/ripng/default-information/originate/node.def
@@ -1,9 +1,9 @@
 help: Set to distribute a default route
 
-create: vyatta-vtysh -c "configure terminal" \
+create: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "default-information originate"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no default-information originate"
diff --git a/templates/protocols/ripng/default-metric/node.def b/templates/protocols/ripng/default-metric/node.def
index 6af8bc3b..fc546c03 100644
--- a/templates/protocols/ripng/default-metric/node.def
+++ b/templates/protocols/ripng/default-metric/node.def
@@ -2,11 +2,11 @@ type: u32
 help: Set metric of redistributed routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "default-metric $VAR(@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no default-metric $VAR(@)"
 
diff --git a/templates/protocols/ripng/distribute-list/access-list/in/node.def b/templates/protocols/ripng/distribute-list/access-list/in/node.def
index b67087bc..f04150f0 100644
--- a/templates/protocols/ripng/distribute-list/access-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/access-list/in/node.def
@@ -3,11 +3,11 @@ help: Set access-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list $VAR(@) in"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list $VAR(@) in"
                      
diff --git a/templates/protocols/ripng/distribute-list/access-list/out/node.def b/templates/protocols/ripng/distribute-list/access-list/out/node.def
index 9345b4b8..0c086528 100644
--- a/templates/protocols/ripng/distribute-list/access-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/access-list/out/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                  \
           -c "distribute-list $VAR(@) out"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                  \
           -c "no distribute-list $VAR(@) out"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
index 2297140c..a481d8ef 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list $VAR(@) in $VAR(../../@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list $VAR(@) in $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
index f6d3d1cc..fa0c54c4 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list $VAR(@) out $VAR(../../@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list $VAR(@) out $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
index 3f29e1b3..cd2e4aad 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) in $VAR(../../@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) in $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
index 1173fc2f..2c847580 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) out $VAR(../../@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) out $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
index dd73f83c..3897a132 100644
--- a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) in"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) in"
diff --git a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
index 7d13bedb..49e38358 100644
--- a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) out"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) out"
diff --git a/templates/protocols/ripng/interface/node.def b/templates/protocols/ripng/interface/node.def
index e55355f4..3df2dd3e 100644
--- a/templates/protocols/ripng/interface/node.def
+++ b/templates/protocols/ripng/interface/node.def
@@ -8,8 +8,8 @@ commit:expression: exec " \
           exit 1 ; \
         fi ; "
 
-create: vyatta-vtysh -c "configure terminal" -c "router ripng" \
+create: vtysh -c "configure terminal" -c "router ripng" \
 	  -c "network $VAR(@)"
 
-delete: vyatta-vtysh -c "configure terminal" -c "router ripng" \
+delete: vtysh -c "configure terminal" -c "router ripng" \
           -c "no network $VAR(@)"
diff --git a/templates/protocols/ripng/network/node.def b/templates/protocols/ripng/network/node.def
index 2bbab1be..163ba2cc 100644
--- a/templates/protocols/ripng/network/node.def
+++ b/templates/protocols/ripng/network/node.def
@@ -4,10 +4,10 @@ help: Set RIPng network
 
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
-create: vyatta-vtysh -c "configure terminal" \
+create: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "network $VAR(@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no network $VAR(@)"
diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def
index 0fdd26cc..d679d6c2 100644
--- a/templates/protocols/ripng/node.def
+++ b/templates/protocols/ripng/node.def
@@ -1,4 +1,4 @@
 priority: 660
 help: Configure Routing Information Protocol (RIPng) parameters
-create: vyatta-vtysh -c "configure terminal" -c "router ripng"
-delete: vyatta-vtysh -c "configure terminal" -c "no router ripng"
+create: vtysh -c "configure terminal" -c "router ripng"
+delete: vtysh -c "configure terminal" -c "no router ripng"
diff --git a/templates/protocols/ripng/passive-interface/node.def b/templates/protocols/ripng/passive-interface/node.def
index c3b1feed..ecbcf546 100644
--- a/templates/protocols/ripng/passive-interface/node.def
+++ b/templates/protocols/ripng/passive-interface/node.def
@@ -9,20 +9,20 @@ syntax:expression: exec " \
      fi ; "
 
 create: if [ x$VAR(x) == xdefault ]; then
-           vyatta-vtysh -c "configure terminal" \
+           vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "passive-interface default";
         else
-           vyatta-vtysh -c "configure terminal" \
+           vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "passive-interface $VAR(@)";
         fi;
 delete: if [ x$VAR(x) == xdefault ]; then
-           vyatta-vtysh -c "configure terminal" \
+           vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "no passive-interface default"
         else
-           vyatta-vtysh -c "configure terminal" \
+           vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "no passive-interface $VAR(@)"; 
         fi;
diff --git a/templates/protocols/ripng/redistribute/bgp/node.def b/templates/protocols/ripng/redistribute/bgp/node.def
index 92d01db4..4c44cbf6 100644
--- a/templates/protocols/ripng/redistribute/bgp/node.def
+++ b/templates/protocols/ripng/redistribute/bgp/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute BGP routes
 
 delete: touch /tmp/rip-redist-bgp.$PPID
 
-end: vyatta-vtysh -c "configure terminal" \
+end: vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute bgp"
      if [ -f "/tmp/rip-redist-bgp.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vyatta-vtysh -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute bgp $COND";
      fi
diff --git a/templates/protocols/ripng/redistribute/connected/node.def b/templates/protocols/ripng/redistribute/connected/node.def
index b2c82096..dfce0b34 100644
--- a/templates/protocols/ripng/redistribute/connected/node.def
+++ b/templates/protocols/ripng/redistribute/connected/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute connected routes
 
 delete: touch /tmp/rip-redist-connected.$PPID
 
-end: vyatta-vtysh -c "configure terminal" \
+end: vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute connected"
      if [ -f "/tmp/rip-redist-connected.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vyatta-vtysh -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute connected $COND";
      fi;
diff --git a/templates/protocols/ripng/redistribute/kernel/node.def b/templates/protocols/ripng/redistribute/kernel/node.def
index 3023733a..fa21a2fc 100644
--- a/templates/protocols/ripng/redistribute/kernel/node.def
+++ b/templates/protocols/ripng/redistribute/kernel/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute kernel routes
 
 delete: touch /tmp/rip-redist-kernel.$PPID
 
-end: vyatta-vtysh -c "configure terminal" \
+end: vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute kernel";
      if [ -f "/tmp/rip-redist-kernel.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vyatta-vtysh -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute kernel $COND";
      fi;
diff --git a/templates/protocols/ripng/redistribute/ospfv3/node.def b/templates/protocols/ripng/redistribute/ospfv3/node.def
index cf4e37ae..1df11812 100644
--- a/templates/protocols/ripng/redistribute/ospfv3/node.def
+++ b/templates/protocols/ripng/redistribute/ospfv3/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute OSPFv3 routes
 
 delete: touch /tmp/rip-redist-ospf6.$PPID
 
-end: vyatta-vtysh -c "configure terminal" \
+end: vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute ospf6";
      if [ -f "/tmp/rip-redist-ospf6.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vyatta-vtysh -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute ospf6 $COND";
      fi;
diff --git a/templates/protocols/ripng/redistribute/static/node.def b/templates/protocols/ripng/redistribute/static/node.def
index 2d142f2b..a47d20a5 100644
--- a/templates/protocols/ripng/redistribute/static/node.def
+++ b/templates/protocols/ripng/redistribute/static/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute static routes
 
 delete: touch /tmp/rip-redist-static.$PPID
 
-end: vyatta-vtysh -c "configure terminal" \
+end: vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute static";
      if [ -f "/tmp/rip-redist-static.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vyatta-vtysh -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ripng"                                         \
           -c "redistribute static $COND";
      fi;
diff --git a/templates/protocols/ripng/route/node.def b/templates/protocols/ripng/route/node.def
index bed064e4..e0e05796 100644
--- a/templates/protocols/ripng/route/node.def
+++ b/templates/protocols/ripng/route/node.def
@@ -4,11 +4,11 @@ help: Set RIPng static route
 
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
-create: vyatta-vtysh -c "configure terminal" \
+create: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "route $VAR(@)"
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no route $VAR(@)"
 
diff --git a/templates/protocols/ripng/timers/node.def b/templates/protocols/ripng/timers/node.def
index a0117092..b82d4c16 100644
--- a/templates/protocols/ripng/timers/node.def
+++ b/templates/protocols/ripng/timers/node.def
@@ -2,13 +2,13 @@ help: Set RIPng timer values
 
 delete: touch /tmp/ripng-timers.$PPID
 
-end: vyatta-vtysh -c "configure terminal" \
+end: vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no timers basic";                                   \
      if [ -f "/tmp/ripng-timers.$PPID" ]; then
         rm -rf /tmp/ripng-timers.$PPID;
      else
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "timers basic $VAR(./update/@)                       \
                            $VAR(./timeout/@)                      \