Merge branch 'glendale' of git:/git/vyatta-op into glendale

8 files changed, 14 insertions, 27 deletions

diff --git a/debian/vyatta-op.postinst.in b/debian/vyatta-op.postinst.in
index 5b47eaa..e8bab7f 100644
--- a/debian/vyatta-op.postinst.in
+++ b/debian/vyatta-op.postinst.in
@@ -5,8 +5,5 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 
 # add symlinks for sudo
-ln -sf /usr/sbin/ethtool ${bindir}/sudo-users/ethtool
-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/debian/vyatta-op.postrm.in b/debian/vyatta-op.postrm.in
deleted file mode 100644
index 8d34999..0000000
--- a/debian/vyatta-op.postrm.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-
-if [ "$1" = "purge" ]; then
-  # remove added symlinks
-  rm -f ${bindir}/sudo-users/ethtool
-  rm -f ${bindir}/sudo-users/iptables
-fi
-
diff --git a/functions/tech-support b/functions/tech-support
index 61422d9..fb6a91f 100644..100755
--- a/functions/tech-support
+++ b/functions/tech-support
@@ -78,7 +78,7 @@ header PCI Info
 lspci
 
 header System Info
-sudo ${vyatta_bindir}/sudo-users/dmidecode
+${vyatta_bindir}/vyatta-show-dmi
 
 header Interfaces
 show interfaces
@@ -128,8 +128,10 @@ cat /etc/apt/sources.list
 header /etc/ipsec.conf
 cat /etc/ipsec.conf
 
-header /etc/ipsec.secrets
-sudo cat /etc/ipsec.secrets
+if [ -r /etc/ipsec.secrets ]; then
+    header /etc/ipsec.secrets
+    cat /etc/ipsec.secrets
+fi
 
 header \''ls -l /etc/rc?.d'\'
 ls -l /etc/rc?.d
@@ -138,16 +140,16 @@ header /etc/rc.local
 cat /etc/rc.local
 
 header \''iptables -L -vn'\'
-sudo ${vyatta_bindir}/sudo-users/iptables -L -vn
+sudo /sbin/iptables -L -vn
 
 header \''iptables -t nat -L -vn'\'
-sudo ${vyatta_bindir}/sudo-users/iptables -t nat -L -vn
+sudo /sbin/iptables -t nat -L -vn
 
 header \''iptables -t mangle -L -vn'\'
-sudo ${vyatta_bindir}/sudo-users/iptables -t mangle -L -vn
+sudo /sbin/iptables -t mangle -L -vn
 
 header \''iptables -t raw -L -vn'\'
-sudo ${vyatta_bindir}/sudo-users/iptables -t raw -L -vn
+sudo /sbin/iptables -t raw -L -vn
 
 header \''show ip route'\'
 show ip route
diff --git a/scripts/vyatta-identify-interface.pl b/scripts/vyatta-identify-interface.pl
index 8837652..1903d06 100644
--- a/scripts/vyatta-identify-interface.pl
+++ b/scripts/vyatta-identify-interface.pl
@@ -44,7 +44,7 @@ if ($cpid == 0) {
   # child
   print "Interface $intf should be blinking now.\n";
   print "Press Enter to stop...\n";
-  exec("ethtool -p $intf");
+  exec("/usr/sbin/ethtool -p $intf");
   # not reachable
   exit 0;
 } else {
diff --git a/templates/clear/arp/address/node.tag/node.def b/templates/clear/arp/address/node.tag/node.def
index 3813b29..23fc5bc 100644
--- a/templates/clear/arp/address/node.tag/node.def
+++ b/templates/clear/arp/address/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Clear ARP cache for address
 allowed: echo -n '<ip_address>'
-run: sudo ${vyatta_bindir}/sudo-users/ip neigh flush to "$4"
+run: sudo /sbin/ip neigh flush to "$4"
diff --git a/templates/clear/arp/interface/node.tag/node.def b/templates/clear/arp/interface/node.tag/node.def
index ca17543..35e83a9 100644
--- a/templates/clear/arp/interface/node.tag/node.def
+++ b/templates/clear/arp/interface/node.tag/node.def
@@ -2,4 +2,4 @@ help: Clear ARP cache for interface
 allowed: local -a array ;
 	 array=( /sys/class/net/{eth,vmnet}* ) ;
 	 echo  -n ${array[@]##*/}
-run: sudo ${vyatta_bindir}/sudo-users/ip neigh flush dev "$4"
+run: sudo /sbin/ip neigh flush dev "$4"
diff --git a/templates/clear/ip/route/cache/node.def b/templates/clear/ip/route/cache/node.def
index 9648cef..b97e0c9 100644
--- a/templates/clear/ip/route/cache/node.def
+++ b/templates/clear/ip/route/cache/node.def
@@ -1,2 +1,2 @@
 help: Flush the kernel route cache
-run: sudo ${vyatta_bindir}/sudo-users/ip route flush cache
+run: sudo /sbin/ip route flush cache
diff --git a/templates/clear/ip/route/cache/node.tag/node.def b/templates/clear/ip/route/cache/node.tag/node.def
index 403e1f9..97f7fc3 100644
--- a/templates/clear/ip/route/cache/node.tag/node.def
+++ b/templates/clear/ip/route/cache/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Flush the kernel route cache for a given route
 allowed: echo -n '<network>'
-run: sudo ${vyatta_bindir}/sudo-users/ip route flush cache "$5"
+run: sudo /sbin/ip route flush cache "$5"