Tidy up messages; ensure errors to to stderr
This commit is contained in:
1 parent
a75a0d8709
commit
c48ae19c55
1 file changed
+3
-3
+3
-3
@@ -129,7 +129,7 @@ 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) > $IP_TMPFILE 2>&1 &&
|
||||
check_command_and_run ethtool ip netns exec $NSPID ethtool -K $3 tx off > /dev/null) > $IP_TMPFILE 2>&1 &&
|
||||
EXITCODE=0
|
||||
else
|
||||
# failed before we assigned the veth to the container's namespace - delete it
|
||||
@@ -139,10 +139,10 @@ configure_container_networking() {
|
||||
|
||||
if [ "$EXITCODE" -ne 0 ] ; then
|
||||
if ! ps -p $DOCKERPID > /dev/null 2>&1 ; then
|
||||
echo "Container died during network set-up. ID $1" >&2
|
||||
echo "Container $1 died" >&2
|
||||
else
|
||||
echo "Failure during network set-up:" >&2
|
||||
cat $IP_TMPFILE
|
||||
cat $IP_TMPFILE >&2
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in new issue
Block a user