projects / systemd / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dbf43a4) | patch
test: disable nspawn checks if machine wasn't booted with systemd
authorDaniel Mack <daniel@zonque.org>
Thu, 19 Nov 2015 13:39:18 +0000 (14:39 +0100)
committerDaniel Mack <daniel@zonque.org>
Thu, 19 Nov 2015 16:14:44 +0000 (17:14 +0100)
commit3f5c306d3810673364f8eae662f3735ffd645a1d
treeb6945601fab66aced3ad091cd8cd0e480f3abc3ftree | snapshot
parentdbf43a42b8bb66d53c7cbab05f104c28097f811ecommit | diff
test: disable nspawn checks if machine wasn't booted with systemd

Sempaphore containers are not booted with systemd, so machined is not
available, which makes nspawn bail. Just skip nspawn tests in such
environments.

[ -d /run/systemd/system ] is esentially what sd_booted(3) is doing,
but on Ubuntu 15.05, without 'systemd-container' installed, we also
need to check for the presence of the systemd-machined binary.
test/test-functions diff | blob | history
https://github.com/systemd/systemd.git