mirror of
https://github.com/systemd/systemd.git
synced 2025-01-09 01:18:19 +03:00
test: move most of TEST-13-NSPAWN-SMOKE setup to static files
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
parent
d10029bba4
commit
e5badaf335
@ -15,179 +15,10 @@ test_setup() {
|
|||||||
|
|
||||||
setup_basic_environment
|
setup_basic_environment
|
||||||
mask_supporting_services
|
mask_supporting_services
|
||||||
dracut_install busybox chmod rmdir unshare ip sysctl
|
|
||||||
|
|
||||||
cp create-busybox-container $initdir/
|
../create-busybox-container $initdir/nc-container
|
||||||
|
|
||||||
./create-busybox-container $initdir/nc-container
|
|
||||||
initdir="$initdir/nc-container" dracut_install nc ip
|
initdir="$initdir/nc-container" dracut_install nc ip
|
||||||
|
|
||||||
# setup the testsuite service
|
|
||||||
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
|
||||||
[Unit]
|
|
||||||
Description=Testsuite service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/test-nspawn.sh
|
|
||||||
Type=oneshot
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat >$initdir/test-nspawn.sh <<'EOF'
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -x
|
|
||||||
set -e
|
|
||||||
set -u
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
export SYSTEMD_LOG_LEVEL=debug
|
|
||||||
|
|
||||||
# check cgroup-v2
|
|
||||||
is_v2_supported=no
|
|
||||||
mkdir -p /tmp/cgroup2
|
|
||||||
if mount -t cgroup2 cgroup2 /tmp/cgroup2; then
|
|
||||||
is_v2_supported=yes
|
|
||||||
umount /tmp/cgroup2
|
|
||||||
fi
|
|
||||||
rmdir /tmp/cgroup2
|
|
||||||
|
|
||||||
# check cgroup namespaces
|
|
||||||
is_cgns_supported=no
|
|
||||||
if [[ -f /proc/1/ns/cgroup ]]; then
|
|
||||||
is_cgns_supported=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
is_user_ns_supported=no
|
|
||||||
# On some systems (e.g. CentOS 7) the default limit for user namespaces
|
|
||||||
# is set to 0, which causes the following unshare syscall to fail, even
|
|
||||||
# with enabled user namespaces support. By setting this value explicitly
|
|
||||||
# we can ensure the user namespaces support to be detected correctly.
|
|
||||||
sysctl -w user.max_user_namespaces=10000
|
|
||||||
if unshare -U sh -c :; then
|
|
||||||
is_user_ns_supported=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
function check_bind_tmp_path {
|
|
||||||
# https://github.com/systemd/systemd/issues/4789
|
|
||||||
local _root="/var/lib/machines/bind-tmp-path"
|
|
||||||
/create-busybox-container "$_root"
|
|
||||||
>/tmp/bind
|
|
||||||
systemd-nspawn --register=no -D "$_root" --bind=/tmp/bind /bin/sh -c 'test -e /tmp/bind'
|
|
||||||
}
|
|
||||||
|
|
||||||
function check_norbind {
|
|
||||||
# https://github.com/systemd/systemd/issues/13170
|
|
||||||
local _root="/var/lib/machines/norbind-path"
|
|
||||||
mkdir -p /tmp/binddir/subdir
|
|
||||||
echo -n "outer" > /tmp/binddir/subdir/file
|
|
||||||
mount -t tmpfs tmpfs /tmp/binddir/subdir
|
|
||||||
echo -n "inner" > /tmp/binddir/subdir/file
|
|
||||||
/create-busybox-container "$_root"
|
|
||||||
systemd-nspawn --register=no -D "$_root" --bind=/tmp/binddir:/mnt:norbind /bin/sh -c 'CONTENT=$(cat /mnt/subdir/file); if [[ $CONTENT != "outer" ]]; then echo "*** unexpected content: $CONTENT"; return 1; fi'
|
|
||||||
}
|
|
||||||
|
|
||||||
function check_notification_socket {
|
|
||||||
# https://github.com/systemd/systemd/issues/4944
|
|
||||||
local _cmd='echo a | $(busybox which nc) -U -u -w 1 /run/systemd/nspawn/notify'
|
|
||||||
systemd-nspawn --register=no -D /nc-container /bin/sh -x -c "$_cmd"
|
|
||||||
systemd-nspawn --register=no -D /nc-container -U /bin/sh -x -c "$_cmd"
|
|
||||||
}
|
|
||||||
|
|
||||||
function run {
|
|
||||||
if [[ "$1" = "yes" && "$is_v2_supported" = "no" ]]; then
|
|
||||||
printf "Unified cgroup hierarchy is not supported. Skipping.\n" >&2
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
if [[ "$2" = "yes" && "$is_cgns_supported" = "no" ]]; then
|
|
||||||
printf "CGroup namespaces are not supported. Skipping.\n" >&2
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
local _root="/var/lib/machines/unified-$1-cgns-$2-api-vfs-writable-$3"
|
|
||||||
/create-busybox-container "$_root"
|
|
||||||
SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" -b
|
|
||||||
SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" --private-network -b
|
|
||||||
|
|
||||||
if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" -U -b; then
|
|
||||||
[[ "$is_user_ns_supported" = "yes" && "$3" = "network" ]] && return 1
|
|
||||||
else
|
|
||||||
[[ "$is_user_ns_supported" = "no" && "$3" = "network" ]] && 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" --private-network -U -b; then
|
|
||||||
[[ "$is_user_ns_supported" = "yes" && "$3" = "yes" ]] && return 1
|
|
||||||
else
|
|
||||||
[[ "$is_user_ns_supported" = "no" && "$3" = "yes" ]] && return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
local _netns_opt="--network-namespace-path=/proc/self/ns/net"
|
|
||||||
|
|
||||||
# --network-namespace-path and network-related options cannot be used together
|
|
||||||
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" --network-interface=lo -b; then
|
|
||||||
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" --network-macvlan=lo -b; then
|
|
||||||
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" --network-ipvlan=lo -b; then
|
|
||||||
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" --network-veth -b; then
|
|
||||||
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" --network-veth-extra=lo -b; then
|
|
||||||
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" --network-bridge=lo -b; then
|
|
||||||
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" --network-zone=zone -b; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# test --network-namespace-path works with a network namespace created by "ip netns"
|
|
||||||
ip netns add nspawn_test
|
|
||||||
_netns_opt="--network-namespace-path=/run/netns/nspawn_test"
|
|
||||||
SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" /bin/ip a | grep -v -E '^1: lo.*UP'
|
|
||||||
local r=$?
|
|
||||||
ip netns del nspawn_test
|
|
||||||
|
|
||||||
if [ $r -ne 0 ]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
check_bind_tmp_path
|
|
||||||
|
|
||||||
check_norbind
|
|
||||||
|
|
||||||
check_notification_socket
|
|
||||||
|
|
||||||
for api_vfs_writable in yes no network; do
|
|
||||||
run no no $api_vfs_writable
|
|
||||||
run yes no $api_vfs_writable
|
|
||||||
run no yes $api_vfs_writable
|
|
||||||
run yes yes $api_vfs_writable
|
|
||||||
done
|
|
||||||
|
|
||||||
touch /testok
|
|
||||||
EOF
|
|
||||||
|
|
||||||
chmod 0755 $initdir/test-nspawn.sh
|
|
||||||
setup_testsuite
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@" 13
|
||||||
|
|||||||
@ -38,6 +38,10 @@ if conf.get('ENABLE_RESOLVE') == 1
|
|||||||
install_dir : testdata_dir)
|
install_dir : testdata_dir)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
install_data('create-busybox-container',
|
||||||
|
install_mode : 'rwxr-xr-x',
|
||||||
|
install_dir : testdata_dir)
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
rule_syntax_check_py = find_program('rule-syntax-check.py')
|
rule_syntax_check_py = find_program('rule-syntax-check.py')
|
||||||
|
|||||||
@ -41,6 +41,7 @@ PATH_TO_INIT=$ROOTLIBDIR/systemd
|
|||||||
|
|
||||||
BASICTOOLS=(
|
BASICTOOLS=(
|
||||||
bash
|
bash
|
||||||
|
busybox
|
||||||
cat
|
cat
|
||||||
chmod
|
chmod
|
||||||
chown
|
chown
|
||||||
@ -53,6 +54,7 @@ BASICTOOLS=(
|
|||||||
false
|
false
|
||||||
gzip
|
gzip
|
||||||
head
|
head
|
||||||
|
ip
|
||||||
ln
|
ln
|
||||||
loadkeys
|
loadkeys
|
||||||
login
|
login
|
||||||
@ -61,6 +63,7 @@ BASICTOOLS=(
|
|||||||
mv
|
mv
|
||||||
nc
|
nc
|
||||||
rm
|
rm
|
||||||
|
rmdir
|
||||||
sed
|
sed
|
||||||
setfont
|
setfont
|
||||||
setsid
|
setsid
|
||||||
@ -69,12 +72,14 @@ BASICTOOLS=(
|
|||||||
socat
|
socat
|
||||||
stat
|
stat
|
||||||
sulogin
|
sulogin
|
||||||
|
sysctl
|
||||||
tail
|
tail
|
||||||
tee
|
tee
|
||||||
test
|
test
|
||||||
touch
|
touch
|
||||||
true
|
true
|
||||||
umount
|
umount
|
||||||
|
unshare
|
||||||
xargs
|
xargs
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -89,7 +94,6 @@ DEBUGTOOLS=(
|
|||||||
grep
|
grep
|
||||||
hostname
|
hostname
|
||||||
id
|
id
|
||||||
ip
|
|
||||||
less
|
less
|
||||||
ln
|
ln
|
||||||
ls
|
ls
|
||||||
|
|||||||
6
test/units/testsuite-13.service
Normal file
6
test/units/testsuite-13.service
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=TEST-13-NSPAWN-SMOKE
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
||||||
|
Type=oneshot
|
||||||
150
test/units/testsuite-13.sh
Executable file
150
test/units/testsuite-13.sh
Executable file
@ -0,0 +1,150 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -x
|
||||||
|
set -e
|
||||||
|
set -u
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
export SYSTEMD_LOG_LEVEL=debug
|
||||||
|
|
||||||
|
# check cgroup-v2
|
||||||
|
is_v2_supported=no
|
||||||
|
mkdir -p /tmp/cgroup2
|
||||||
|
if mount -t cgroup2 cgroup2 /tmp/cgroup2; then
|
||||||
|
is_v2_supported=yes
|
||||||
|
umount /tmp/cgroup2
|
||||||
|
fi
|
||||||
|
rmdir /tmp/cgroup2
|
||||||
|
|
||||||
|
# check cgroup namespaces
|
||||||
|
is_cgns_supported=no
|
||||||
|
if [[ -f /proc/1/ns/cgroup ]]; then
|
||||||
|
is_cgns_supported=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
is_user_ns_supported=no
|
||||||
|
# On some systems (e.g. CentOS 7) the default limit for user namespaces
|
||||||
|
# is set to 0, which causes the following unshare syscall to fail, even
|
||||||
|
# with enabled user namespaces support. By setting this value explicitly
|
||||||
|
# we can ensure the user namespaces support to be detected correctly.
|
||||||
|
sysctl -w user.max_user_namespaces=10000
|
||||||
|
if unshare -U sh -c :; then
|
||||||
|
is_user_ns_supported=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
function check_bind_tmp_path {
|
||||||
|
# https://github.com/systemd/systemd/issues/4789
|
||||||
|
local _root="/var/lib/machines/bind-tmp-path"
|
||||||
|
/usr/lib/systemd/tests/testdata/create-busybox-container "$_root"
|
||||||
|
>/tmp/bind
|
||||||
|
systemd-nspawn --register=no -D "$_root" --bind=/tmp/bind /bin/sh -c 'test -e /tmp/bind'
|
||||||
|
}
|
||||||
|
|
||||||
|
function check_norbind {
|
||||||
|
# https://github.com/systemd/systemd/issues/13170
|
||||||
|
local _root="/var/lib/machines/norbind-path"
|
||||||
|
mkdir -p /tmp/binddir/subdir
|
||||||
|
echo -n "outer" > /tmp/binddir/subdir/file
|
||||||
|
mount -t tmpfs tmpfs /tmp/binddir/subdir
|
||||||
|
echo -n "inner" > /tmp/binddir/subdir/file
|
||||||
|
/usr/lib/systemd/tests/testdata/create-busybox-container "$_root"
|
||||||
|
systemd-nspawn --register=no -D "$_root" --bind=/tmp/binddir:/mnt:norbind /bin/sh -c 'CONTENT=$(cat /mnt/subdir/file); if [[ $CONTENT != "outer" ]]; then echo "*** unexpected content: $CONTENT"; return 1; fi'
|
||||||
|
}
|
||||||
|
|
||||||
|
function check_notification_socket {
|
||||||
|
# https://github.com/systemd/systemd/issues/4944
|
||||||
|
local _cmd='echo a | $(busybox which nc) -U -u -w 1 /run/systemd/nspawn/notify'
|
||||||
|
systemd-nspawn --register=no -D /nc-container /bin/sh -x -c "$_cmd"
|
||||||
|
systemd-nspawn --register=no -D /nc-container -U /bin/sh -x -c "$_cmd"
|
||||||
|
}
|
||||||
|
|
||||||
|
function run {
|
||||||
|
if [[ "$1" = "yes" && "$is_v2_supported" = "no" ]]; then
|
||||||
|
printf "Unified cgroup hierarchy is not supported. Skipping.\n" >&2
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
if [[ "$2" = "yes" && "$is_cgns_supported" = "no" ]]; then
|
||||||
|
printf "CGroup namespaces are not supported. Skipping.\n" >&2
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
local _root="/var/lib/machines/unified-$1-cgns-$2-api-vfs-writable-$3"
|
||||||
|
/usr/lib/systemd/tests/testdata/create-busybox-container "$_root"
|
||||||
|
SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" -b
|
||||||
|
SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" --private-network -b
|
||||||
|
|
||||||
|
if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" -U -b; then
|
||||||
|
[[ "$is_user_ns_supported" = "yes" && "$3" = "network" ]] && return 1
|
||||||
|
else
|
||||||
|
[[ "$is_user_ns_supported" = "no" && "$3" = "network" ]] && 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" --private-network -U -b; then
|
||||||
|
[[ "$is_user_ns_supported" = "yes" && "$3" = "yes" ]] && return 1
|
||||||
|
else
|
||||||
|
[[ "$is_user_ns_supported" = "no" && "$3" = "yes" ]] && return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local _netns_opt="--network-namespace-path=/proc/self/ns/net"
|
||||||
|
|
||||||
|
# --network-namespace-path and network-related options cannot be used together
|
||||||
|
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" --network-interface=lo -b; then
|
||||||
|
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" --network-macvlan=lo -b; then
|
||||||
|
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" --network-ipvlan=lo -b; then
|
||||||
|
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" --network-veth -b; then
|
||||||
|
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" --network-veth-extra=lo -b; then
|
||||||
|
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" --network-bridge=lo -b; then
|
||||||
|
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" --network-zone=zone -b; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
# test --network-namespace-path works with a network namespace created by "ip netns"
|
||||||
|
ip netns add nspawn_test
|
||||||
|
_netns_opt="--network-namespace-path=/run/netns/nspawn_test"
|
||||||
|
SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" /bin/ip a | grep -v -E '^1: lo.*UP'
|
||||||
|
local r=$?
|
||||||
|
ip netns del nspawn_test
|
||||||
|
|
||||||
|
if [ $r -ne 0 ]; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
check_bind_tmp_path
|
||||||
|
|
||||||
|
check_norbind
|
||||||
|
|
||||||
|
check_notification_socket
|
||||||
|
|
||||||
|
for api_vfs_writable in yes no network; do
|
||||||
|
run no no $api_vfs_writable
|
||||||
|
run yes no $api_vfs_writable
|
||||||
|
run no yes $api_vfs_writable
|
||||||
|
run yes yes $api_vfs_writable
|
||||||
|
done
|
||||||
|
|
||||||
|
touch /testok
|
||||||
Loading…
Reference in New Issue
Block a user