diff options
| author |   Felipe Sateler <fsateler@gmail.com> | 2017-06-21 16:04:38 -0400 |
|---|---|---|
| committer | Felipe Sateler <fsateler@gmail.com> | 2017-06-21 16:19:20 -0400 |
| commit | 78d1039d6b891c41ff68cdaa2bc9e9796e8d14c3 (patch) | |
| tree | 5a0ec41bd78832f503a3b42b37dd7d9e34483b37 /units | |
| parent | systemd-nspawn@.service: start after /var/lib/machines is mounted (#6079) (diff) | |
| download | systemd-78d1039d6b891c41ff68cdaa2bc9e9796e8d14c3.tar.gz systemd-78d1039d6b891c41ff68cdaa2bc9e9796e8d14c3.tar.bz2 systemd-78d1039d6b891c41ff68cdaa2bc9e9796e8d14c3.zip | |
nspawn: hook var-lib-machines.mount to machines.target and remote-fs.target
/var can be on a remote filesystem, thus hooking it to local-fs.target is not correct.
Also, only install the mount unit when machined is enabled, because
machined is the one managing the underlying device, and thus makes no
sense without machined.
Fixes #1175
Diffstat (limited to 'units')
| -rw-r--r-- | units/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/units/meson.build b/units/meson.build index 6fb1fa29c..e94add6a6 100644 --- a/units/meson.build +++ b/units/meson.build @@ -101,8 +101,8 @@ units = [ ['timers.target', ''], ['umount.target', ''], ['user.slice', ''], - ['var-lib-machines.mount', '', - 'local-fs.target.wants/'], + ['var-lib-machines.mount', 'ENABLE_MACHINED', + 'remote-fs.target.wants/ machines.target.wants/'], ] in_units = [ |