diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2018-07-05 16:30:52 +0000 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2020-02-12 13:15:21 +0100 |
| commit | 03cb19036ea29af858ea0b9ec7a7591587e1255b (patch) | |
| tree | c1eed46b4eb5dbca094a30f8d28ad0fdc6433b9b | |
| parent | ec920bcc0dbb6a9b4944efcb012257f93ee5b8c7 (diff) | |
| download | systemd-03cb19036ea29af858ea0b9ec7a7591587e1255b.tar.gz | |
tests: allow passing additional arguments to nspawn via NSPAWN_ARGUMENTS
Related: #1794787
(cherry picked from commit 57916ea352b85153ecbed803d52861ca8b933dd3)
(cherry picked from commit 164ead52f895785e0461ef205c5be317b400b0ff)
| -rw-r--r-- | test/test-functions | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index e80c885342..6a48708c17 100644 --- a/test/test-functions +++ b/test/test-functions @@ -190,7 +190,7 @@ $KERNEL_APPEND \ run_nspawn() { [[ -d /run/systemd/system ]] || return 1 - local _nspawn_cmd="$BUILD_DIR/systemd-nspawn --register=no --kill-signal=SIGKILL --directory=$TESTDIR/nspawn-root $PATH_TO_INIT $KERNEL_APPEND" + local _nspawn_cmd="$BUILD_DIR/systemd-nspawn $NSPAWN_ARGUMENTS --register=no --kill-signal=SIGKILL --directory=$TESTDIR/nspawn-root $PATH_TO_INIT $KERNEL_APPEND" if [[ "$NSPAWN_TIMEOUT" != "infinity" ]]; then _nspawn_cmd="timeout --foreground $NSPAWN_TIMEOUT $_nspawn_cmd" fi |