diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 08:43:34 -0400 |
| commit | 670b77ddfab0f4eddbe539964aba83d446d48129 (patch) | |
| tree | 5b159fe9bd52169e05cdc60db5a48a5c5ac9602a /test/TEST-07-ISSUE-1981/test.sh | |
| parent | 23708daf3ba69ba9880102b4f720a3842883332e (diff) | |
| parent | 34dbdee3b2f122d2ef903a368b172e75f962b66a (diff) | |
Merge branch 'lukeshu/postmove' into 'lukeshu/master'
Diffstat (limited to 'test/TEST-07-ISSUE-1981/test.sh')
| -rwxr-xr-x | test/TEST-07-ISSUE-1981/test.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh index dcb6ece4d4..d97c4ec27d 100755 --- a/test/TEST-07-ISSUE-1981/test.sh +++ b/test/TEST-07-ISSUE-1981/test.sh @@ -8,7 +8,8 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/1981" test_run() { dwarn "skipping QEMU" if check_nspawn; then - timeout --foreground 30s systemd-nspawn --kill-signal=SIGKILL --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND + NSPAWN_TIMEOUT=30s + run_nspawn check_result_nspawn || return 1 else dwarn "can't run systemd-nspawn, skipping" |