Fix side effect(host target rebooting issue) when enlightenment killed in container.

Revert "runc: Make not to create docker folder in the watchdog cgroup"
This reverts commit bd883d50e34b6131376c829a8bbe6fe0ae23ab8f.

Revert "Revert "systemd/docker-engine.service: early disable docker watchdog cgroup""
This reverts commit ac86c84af189c0a780914ec2eb68bff097022dbe.

Change-Id: Id666a782f465549487b205b50585216c450468d9
Signed-off-by: Kiwoong Ha <kw1981.ha@samsung.com>

diff --git a/prebuilt/overlay/runc-aarch64 b/prebuilt/overlay/runc-aarch64
index 396e48f..c69e448 100755 (executable)
Binary files a/prebuilt/overlay/runc-aarch64 and b/prebuilt/overlay/runc-aarch64 differ

diff --git a/prebuilt/overlay/runc-arm b/prebuilt/overlay/runc-arm
index c961a0c..5bdb90b 100755 (executable)
Binary files a/prebuilt/overlay/runc-arm and b/prebuilt/overlay/runc-arm differ

diff --git a/prebuilt/overlay/runc-x86_64 b/prebuilt/overlay/runc-x86_64
index 208106b..27f7308 100755 (executable)
Binary files a/prebuilt/overlay/runc-x86_64 and b/prebuilt/overlay/runc-x86_64 differ

diff --git a/systemd/docker-engine.service b/systemd/docker-engine.service
index 0dc8b4f..44db9a0 100644 (file)
--- a/systemd/docker-engine.service
+++ b/systemd/docker-engine.service
@@ -8,6 +8,7 @@ Requires=docker-engine.socket
 Type=notify
 SmackProcessLabel=System::Privileged
 ExecStart=/usr/bin/dockerd --userland-proxy=false --data-root /opt/var/lib/docker -H fd:// -H tcp://0.0.0.0:2375 --bridge none
+ExecStartPost=-/bin/sh -c "mkdir /sys/fs/cgroup/watchdog/docker; test -d /sys/fs/cgroup/watchdog/docker && echo 0 > /sys/fs/cgroup/watchdog/docker/notify_on_release"
 ExecReload=/bin/kill -s HUP $MAINPID
 LimitNOFILE=1048576
 # Having non-zero Limit*s causes performance problems due to accounting overhead