Fix operator permissions for "clear interface counters" and "clear dhcp client process"

11 files changed, 12 insertions, 10 deletions

diff --git a/debian/vyatta-op.postinst.in b/debian/vyatta-op.postinst.in
index bdb6bcd..ac650fc 100644
--- a/debian/vyatta-op.postinst.in
+++ b/debian/vyatta-op.postinst.in
@@ -9,3 +9,5 @@ ln -sf /usr/sbin/ethtool ${bindir}/sudo-users/ethtool
 ln -sf /usr/sbin/dmidecode ${bindir}/sudo-users/dmidecode
 ln -sf /sbin/iptables ${bindir}/sudo-users/iptables
 ln -sf /bin/ip ${bindir}/sudo-users/ip
+ln -sf /opt/vyatta/bin/vyatta-show-interfaces.pl ${bindir}/sudo-users/vyatta-show-interfaces.pl
+ln -sf /opt/vyatta/sbin/vyatta-interfaces.pl ${bindir}/sudo-users/vyatta-interfaces.pl
diff --git a/templates/clear/dhcp/client/process/node.def b/templates/clear/dhcp/client/process/node.def
index 565e702..50e52ff 100644
--- a/templates/clear/dhcp/client/process/node.def
+++ b/templates/clear/dhcp/client/process/node.def
@@ -1,2 +1,2 @@
 help: Restart the dhcp client process
-run: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --restart-dhclient
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-interfaces.pl --restart-dhclient
diff --git a/templates/clear/interfaces/bridge/counters/node.def b/templates/clear/interfaces/bridge/counters/node.def
index ad13229..1a93d5b 100644
--- a/templates/clear/interfaces/bridge/counters/node.def
+++ b/templates/clear/interfaces/bridge/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear all bridge interface counters
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/bridge/node.tag/counters/node.def b/templates/clear/interfaces/bridge/node.tag/counters/node.def
index 985e9ab..086f966 100644
--- a/templates/clear/interfaces/bridge/node.tag/counters/node.def
+++ b/templates/clear/interfaces/bridge/node.tag/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear interface counters for a given interface
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf=$4
diff --git a/templates/clear/interfaces/counters/node.def b/templates/clear/interfaces/counters/node.def
index 252251a..a29bcbc 100644
--- a/templates/clear/interfaces/counters/node.def
+++ b/templates/clear/interfaces/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear interface counters for all interfaces
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear
diff --git a/templates/clear/interfaces/ethernet/counters/node.def b/templates/clear/interfaces/ethernet/counters/node.def
index e05e218..e7a5d6a 100644
--- a/templates/clear/interfaces/ethernet/counters/node.def
+++ b/templates/clear/interfaces/ethernet/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear all Ethernet interface counters
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/ethernet/node.tag/counters/node.def b/templates/clear/interfaces/ethernet/node.tag/counters/node.def
index 985e9ab..086f966 100644
--- a/templates/clear/interfaces/ethernet/node.tag/counters/node.def
+++ b/templates/clear/interfaces/ethernet/node.tag/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear interface counters for a given interface
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf=$4
diff --git a/templates/clear/interfaces/loopback/counters/node.def b/templates/clear/interfaces/loopback/counters/node.def
index 5ebcd3d..37761b6 100644
--- a/templates/clear/interfaces/loopback/counters/node.def
+++ b/templates/clear/interfaces/loopback/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear all loopback interface counters
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/loopback/node.tag/counters/node.def b/templates/clear/interfaces/loopback/node.tag/counters/node.def
index 985e9ab..086f966 100644
--- a/templates/clear/interfaces/loopback/node.tag/counters/node.def
+++ b/templates/clear/interfaces/loopback/node.tag/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear interface counters for a given interface
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf=$4
diff --git a/templates/clear/interfaces/tunnel/counters/node.def b/templates/clear/interfaces/tunnel/counters/node.def
index c856a04..8816a99 100644
--- a/templates/clear/interfaces/tunnel/counters/node.def
+++ b/templates/clear/interfaces/tunnel/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear all tunnel interface counters
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/tunnel/node.tag/counters/node.def b/templates/clear/interfaces/tunnel/node.tag/counters/node.def
index 985e9ab..086f966 100644
--- a/templates/clear/interfaces/tunnel/node.tag/counters/node.def
+++ b/templates/clear/interfaces/tunnel/node.tag/counters/node.def
@@ -1,2 +1,2 @@
 help: Clear interface counters for a given interface
-run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf=$4