projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vswitchd: Drop redundant 'iface_cfg' parameter to set_up_iface().
[openvswitch]
/
debian
/
ovs-bugtool
diff --git
a/debian/ovs-bugtool
b/debian/ovs-bugtool
index f991f27a232b17d40c621dd32f67b9b450d5d870..6f792eea74f9401b3760fcef302976d72967e724 100755
(executable)
--- 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'
DF = '/bin/df'
DMESG = '/bin/dmesg'
DMIDECODE = '/usr/sbin/dmidecode'
-ETHTOOL = '/sbin/ethtool'
FDISK = '/sbin/fdisk'
FIND = '/usr/bin/find'
IFCONFIG = '/sbin/ifconfig'
FDISK = '/sbin/fdisk'
FIND = '/usr/bin/find'
IFCONFIG = '/sbin/ifconfig'
@@
-136,6
+135,11
@@
TC = '/sbin/tc'
UPTIME = '/usr/bin/uptime'
ZCAT = '/bin/zcat'
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.
#
# PII -- Personally identifiable information. Of particular concern are
# things that would identify customers, or their network topology.