From 34cc5c24d052facb802331b8703664e5dc0ea10c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 15 May 2019 20:52:59 +0900 Subject: [PATCH] dockerd-rootless.sh: use exec Killing the shell script process does not kill the forked process. This commit switches to `exec` so that the executed process can be easily killed. Signed-off-by: Akihiro Suda --- contrib/dockerd-rootless.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/dockerd-rootless.sh b/contrib/dockerd-rootless.sh index 3206134608..214162f626 100755 --- a/contrib/dockerd-rootless.sh +++ b/contrib/dockerd-rootless.sh @@ -75,7 +75,7 @@ if [ -z $_DOCKERD_ROOTLESS_CHILD ]; then # namespace from being unexpectedly unmounted when `/etc/resolv.conf` is recreated on the host # (by either systemd-networkd or NetworkManager) # * /run: copy-up is required so that we can create /run/docker (hardcoded for plugins) in our namespace - $rootlesskit \ + exec $rootlesskit \ --net=$net --mtu=$mtu \ --disable-host-loopback --port-driver=builtin \ --copy-up=/etc --copy-up=/run \ @@ -86,5 +86,5 @@ else # remove the symlinks for the existing files in the parent namespace if any, # so that we can create our own files in our mount namespace. rm -f /run/docker /run/xtables.lock - dockerd $@ + exec dockerd $@ fi