SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1991 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
parent 68e038572b 2c393ed761
commit aad2652326
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test-functions
+2 -3
View File
@@ -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 ]]
}