X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Fovs-bugtool;h=11d3acbcb2cc39c187a556cf937b7351b83a889b;hb=217f48c61bbfe1422f00830f36d2d255d3622446;hp=f991f27a232b17d40c621dd32f67b9b450d5d870;hpb=b828c2f5fa580412f7c3afae03862b9dcce6f576;p=openvswitch

diff --git a/debian/ovs-bugtool b/debian/ovs-bugtool
index f991f27a..11d3acbc 100755
--- a/debian/ovs-bugtool
+++ b/debian/ovs-bugtool
@@ -114,7 +114,6 @@ CAT = '/bin/cat'
 DF = '/bin/df'
 DMESG = '/bin/dmesg'
 DMIDECODE = '/usr/sbin/dmidecode'
-ETHTOOL = '/sbin/ethtool'
 FDISK = '/sbin/fdisk'
 FIND = '/usr/bin/find'
 IFCONFIG = '/sbin/ifconfig'
@@ -136,6 +135,11 @@ TC = '/sbin/tc'
 UPTIME = '/usr/bin/uptime'
 ZCAT = '/bin/zcat'
 
+ETHTOOL = '/sbin/ethtool'
+# ETHTOOL recently moved from /usr/sbin to /sbin in debian
+if not os.path.isfile(ETHTOOL):
+    ETHTOOL = '/usr/sbin/ethtool'
+
 #
 # PII -- Personally identifiable information.  Of particular concern are
 # things that would identify customers, or their network topology.
@@ -494,6 +498,8 @@ exclude those logs from the archive.
                 cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-k', p])
                 cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-i', p])
                 cmd_output(CAP_NETWORK_STATUS, [ETHTOOL, '-c', p])
+                cmd_output(CAP_NETWORK_STATUS,
+                           [TC, '-s', '-d', 'class', 'show', 'dev', p])
         except:
             pass
     cmd_output(CAP_NETWORK_STATUS, [TC, '-s', 'qdisc'])