Merge pull request #100 from AkihiroSuda/a

rootlesskit: isolate --pidns
rootless-containers · Jun 3, 2019 · 47773f7 · 47773f7
2 parents 23a8c58 + 8cb9d49
commit 47773f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/boot/rootlesskit.sh b/boot/rootlesskit.sh
@@ -36,6 +36,7 @@ if [[ $_U7S_CHILD == 0 ]]; then
 		--net=slirp4netns --mtu=65520 --disable-host-loopback \
 		--port-driver=builtin \
 		--copy-up=/etc --copy-up=/run --copy-up=/var/lib --copy-up=/opt \
+		--pidns \
 		$U7S_ROOTLESSKIT_FLAGS \
 		$0 $@
 else

diff --git a/common/common.inc.sh b/common/common.inc.sh
@@ -87,7 +87,7 @@ function nsenter::_nsenter() {
 	fi
 	export ROOTLESSKIT_STATE_DIR=$XDG_RUNTIME_DIR/usernetes/rootlesskit
 	# TODO(AkihiroSuda): ping to $XDG_RUNTIME_DIR/usernetes/rootlesskit/api.sock
-	nsenter -U --preserve-credential -n -m -t $(cat $pidfile) --wd=$PWD -- $@
+	nsenter -U --preserve-credential -n -m -p -t $(cat $pidfile) --wd=$PWD -- $@
 }
 
 ## overlayfs utilities