summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-24 16:24:24 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-24 16:24:24 +0100
commitaad2652326dea4c6b51002f3e62e1fd2dac7931d (patch)
tree1fc9cad3627cbb7a370a0e15e6d44a6de584849d /test
parent68e038572bfa198a58d7d7bf3a06a2b838f6b201 (diff)
parent2c393ed7611a586ef5665aa62453ec57c0f5fef6 (diff)
Merge pull request #1991 from evverx/use-systems-nspawn
tests: don't rely on system's machined
Diffstat (limited to 'test')
-rw-r--r--test/test-functions5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/test-functions b/test/test-functions
index fca163a979..a5644eaf73 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -92,7 +92,7 @@ $KERNEL_APPEND \
run_nspawn() {
set -x
- ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND
+ ../../systemd-nspawn --register=no --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND
}
setup_basic_environment() {
@@ -1135,8 +1135,7 @@ inst_libdir_file() {
check_nspawn() {
[[ -d /sys/fs/cgroup/systemd ]] && \
- [[ -d /run/systemd/system ]] && \
- [[ -e /lib/systemd/systemd-machined ]]
+ [[ -d /run/systemd/system ]]
}