shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 03:25:27 +03:00
Code

tests: don't rely on system's machined

Browse Source 
Fixes backward/forward incompatibility errors on spawning.

For example:
$ sudo make run
...
Failed to register machine: Cannot set property TasksMax, or unknown
property.

$ ../../systemd-nspawn --version
systemd 228

$ systemd-nspawn --version
systemd 225
This commit is contained in:
Evgeny Vereshchagin 2015-11-23 04:36:39 +00:00
parent 8c191eecd4
commit 2c393ed761
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/test-functions
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 ]]
}