]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: allow passing additional arguments to nspawn via NSPAWN_ARGUMENTS
authorEvgeny Vereshchagin <evvers@ya.ru>
Thu, 5 Jul 2018 16:30:52 +0000 (16:30 +0000)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 18 Jul 2018 00:56:23 +0000 (09:56 +0900)
test/test-functions

index f3263411b029687e95e4dec3e9f4c68b00b5fb02..accaf927c87a54661b22d426d2b0a5354c5c2311 100644 (file)
@@ -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