Browse code

Merge pull request #216 from AkihiroSuda/rootless-fix-kill-1903

[19.03 backport] rootless: fix killing daemon

Andrew Hsu authored on 2019/05/25 01:46:01
Showing 2 changed files
... ...
@@ -75,7 +75,7 @@ if [ -z $_DOCKERD_ROOTLESS_CHILD ]; then
75 75
 	#         namespace from being unexpectedly unmounted when `/etc/resolv.conf` is recreated on the host
76 76
 	#         (by either systemd-networkd or NetworkManager)
77 77
 	# * /run: copy-up is required so that we can create /run/docker (hardcoded for plugins) in our namespace
78
-	$rootlesskit \
78
+	exec $rootlesskit \
79 79
 		--net=$net --mtu=$mtu \
80 80
 		--disable-host-loopback --port-driver=builtin \
81 81
 		--copy-up=/etc --copy-up=/run \
... ...
@@ -86,5 +86,5 @@ else
86 86
 	# remove the symlinks for the existing files in the parent namespace if any,
87 87
 	# so that we can create our own files in our mount namespace.
88 88
 	rm -f /run/docker /run/xtables.lock
89
-	dockerd $@
89
+	exec dockerd $@
90 90
 fi
... ...
@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 
3
-# v0.4.0
4
-ROOTLESSKIT_COMMIT=e92d5e772ee7e103aecf380c5874a40c52876ff0
3
+# v0.4.1
4
+ROOTLESSKIT_COMMIT=27a0c7a2483732b33d4192c1d178c83c6b9e202d
5 5
 
6 6
 install_rootlesskit() {
7 7
 	case "$1" in