Merge pull request #830 from rade/829_fix_container_death_check

kill -0 $CONTAINER_PID does not work inside weaveexec container

Fixes #829.
This commit is contained in:
Matthias Radestock committed 2015-06-03 11:17:23 +01:00
commit 52f31f0596
1 file changed
+1 -1
+1 -1
View File
@@ -335,7 +335,7 @@ with_container_netns() {
shift 1
if ! "$@" >$IP_TMPOUT 2>$IP_TMPERR ; then
STATUS=1
if ! kill -0 "$CONTAINER_PID" 2>/dev/null ; then
if [ ! -d $PROCFS/$CONTAINER_PID ] ; then
echo "Container $CONTAINER died" >&2
else
echo "Failure during network configuration for container $CONTAINER:" >&2