Skip to content

Commit 4c2e8c6

Browse files
committed
tests: --create-sandbox doesn't umount under /run
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
1 parent a9c57a9 commit 4c2e8c6

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ EXTRA_DIST = \
1616
api.h \
1717
sandbox.h \
1818
seccompfilter.h \
19+
tests/slirp4netns-no-unmount.sh \
1920
vendor/libslirp/COPYRIGHT \
2021
vendor/libslirp/README.md \
2122
vendor/libslirp/src/bootp.h \

tests/slirp4netns-no-unmount.sh

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
set -xeuo pipefail
3+
4+
. $(dirname $0)/common.sh
5+
6+
# it is a part of test-slirp4netns.sh
7+
# must run in a new mount namespace
8+
9+
mount -t tmpfs tmpfs /run
10+
mkdir /run/foo
11+
mount -t tmpfs tmpfs /run/foo
12+
mount --make-rshared /run
13+
14+
unshare -n sleep infinity &
15+
child=$!
16+
17+
wait_for_network_namespace $child
18+
19+
./slirp4netns --enable-sandbox --netns-type=path /proc/$child/ns/net tun11 &
20+
slirp_pid=$!
21+
22+
function cleanup {
23+
kill -9 $child $slirp_pid
24+
}
25+
trap cleanup EXIT
26+
27+
wait_for_network_device $child tun11
28+
29+
findmnt /run/foo

tests/test-slirp4netns.sh

+2
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,5 @@ wait_for_network_device $child tun11
6767

6868
nsenter --preserve-credentials -U -n --target=$child ip -a netconf | grep tun11
6969
nsenter --preserve-credentials -U -n --target=$child ip addr show tun11 | grep -v inet
70+
71+
unshare -rm $(readlink -f $(dirname $0)/slirp4netns-no-unmount.sh)

0 commit comments

Comments
 (0)