From eabcc55f7368797c272e3f6795e7c08613a61c5c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 17 Sep 2014 16:25:46 +0100 Subject: [PATCH] fix subshell syntax and make del/delete consistent --- weaver/weave | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weaver/weave b/weaver/weave index d0598469..fcb5a492 100755 --- a/weaver/weave +++ b/weaver/weave @@ -128,11 +128,11 @@ configure_container_networking() { ip netns exec $NSPID ip link set $GUEST_IFNAME name $CONTAINER_IFNAME && \ ip netns exec $NSPID ip addr add $2 dev $CONTAINER_IFNAME && \ ip netns exec $NSPID ip link set $CONTAINER_IFNAME up && \ - $(check_command_and_run ethtool ip netns exec $NSPID ethtool -K $3 tx off >/dev/null) && \ + (check_command_and_run ethtool ip netns exec $NSPID ethtool -K $3 tx off >/dev/null) && \ EXITCODE=0 else # failed before we assigned the veth to the container's namespace - delete it - ip link delete $LOCAL_IFNAME type veth || true + ip link del $LOCAL_IFNAME type veth || true fi fi