summaryrefslogtreecommitdiff
path: root/test/TEST-13-NSPAWN-SMOKE
diff options
context:
space:
mode:
authorShengjing Zhu <i@zhsj.me>2019-12-09 03:00:01 +0800
committerLennart Poettering <lennart@poettering.net>2019-12-12 19:26:32 +0100
commit679ecd3616345ae3ea1791af747546ae583d0cb8 (patch)
tree8a30501e380bfe7f1ea09c42683ae10db1e8bc59 /test/TEST-13-NSPAWN-SMOKE
parent3e761fe2c93eaa62ce07565f210f4024c6615dcc (diff)
downloadsystemd-679ecd3616345ae3ea1791af747546ae583d0cb8.tar.gz
nspawn: allow combination of private-network and network-namespace-path
Fixes: #14289
Diffstat (limited to 'test/TEST-13-NSPAWN-SMOKE')
-rwxr-xr-xtest/TEST-13-NSPAWN-SMOKE/test.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh
index 747d30d952..de504df632 100755
--- a/test/TEST-13-NSPAWN-SMOKE/test.sh
+++ b/test/TEST-13-NSPAWN-SMOKE/test.sh
@@ -150,7 +150,8 @@ function run {
return 1
fi
- if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" --private-network -b; then
+ # allow combination of --network-namespace-path and --private-network
+ if ! SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" --private-network -b; then
return 1
fi