diff options
| author | Felipe Sateler <fsateler@debian.org> | 2019-02-20 21:24:33 -0300 |
|---|---|---|
| committer | Felipe Sateler <fsateler@debian.org> | 2019-02-20 21:24:33 -0300 |
| commit | 7c20daf69c4411979b7f8902f3601d1cdc56cc07 (patch) | |
| tree | d59b9989ce55ed23693e80974d94c856f1c2c8b1 /test/TEST-01-BASIC/test.sh | |
| parent | 6e866b331d7cd4a5e0759dd160dea6edabd3678e (diff) | |
| download | systemd-upstream/241.tar.gz | |
New upstream version 241upstream/241
Diffstat (limited to 'test/TEST-01-BASIC/test.sh')
| -rwxr-xr-x | test/TEST-01-BASIC/test.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 1d2f833478..1c64017aaa 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -3,7 +3,7 @@ # ex: ts=8 sw=4 sts=4 et filetype=sh set -e TEST_DESCRIPTION="Basic systemd setup" -RUN_IN_UNPRIVILEGED_CONTAINER=yes +RUN_IN_UNPRIVILEGED_CONTAINER=${RUN_IN_UNPRIVILEGED_CONTAINER:-yes} . $TEST_BASE_DIR/test-functions @@ -26,7 +26,7 @@ Description=Testsuite service After=multi-user.target [Service] -ExecStart=/bin/sh -x -c 'systemctl --state=failed --no-legend --no-pager > /failed ; echo OK > /testok' +ExecStart=/bin/sh -x -c 'systemctl --state=failed --no-legend --no-pager > /failed ; systemctl daemon-reload ; echo OK > /testok' Type=oneshot EOF @@ -34,13 +34,6 @@ EOF ) || return 1 setup_nspawn_root - # mask some services that we do not want to run in these tests - ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service - ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service - ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service - ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket - ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service - ddebug "umount $TESTDIR/root" umount $TESTDIR/root } |