From dced4e3d6fea501dde1ff73e1a995106e571df48 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 28 Aug 2014 17:20:17 +0100 Subject: [PATCH] add a test to see whether ethtool is available before trying to run it --- weaver/weave | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/weaver/weave b/weaver/weave index 2e97b726..92939eb1 100755 --- a/weaver/weave +++ b/weaver/weave @@ -87,7 +87,12 @@ ip netns exec $NSPID ip link set $GUEST_IFNAME name $CONTAINER_IFNAME ip netns exec $NSPID ip addr add $IPADDR dev $CONTAINER_IFNAME ip netns exec $NSPID ip link set $CONTAINER_IFNAME up -ip netns exec $NSPID ethtool -K $IFACE tx off > /dev/null +if [ command -v ethtool >/dev/null 2>&1 ] +then + ip netns exec $NSPID ethtool -K $IFACE tx off > /dev/null +else + echo "Unable to run ethtool command; continuing without it" >&2 +fi [ -f /var/run/netns/$NSPID ] && rm -f /var/run/netns/$NSPID