shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-04-01 18:50:16 +03:00
Code

Merge pull request from evverx/use-systems-nspawn

Browse Source 
tests: don't rely on system's machined
This commit is contained in:
Lennart Poettering 2015-11-24 16:24:24 +01:00
commit aad2652326
1 changed files with 2 additions and 3 deletions

5
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 ]]
}