From 2b8e39ae83c28509accc56597da0fae1032aaaf1 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Wed, 22 Sep 2010 17:29:12 -0700 Subject: [PATCH] debian: Support two locations for ethtool The ethtool binary recently moved from /usr/sbin to /sbin. This change falls back to /usr/sbin/ethtool if /sbin/ethtool does not exist. --- debian/ovs-bugtool | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/ovs-bugtool b/debian/ovs-bugtool index f991f27a2..6f792eea7 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. -- 2.43.0