diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-20 15:52:52 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-01-03 15:30:28 +0100 |
| commit | 9b69569d2cc5b7a5a2b6753f53fab120b3610725 (patch) | |
| tree | 681a0d335b102dcaa2bfe1a13cc29fbe283cac12 /units | |
| parent | fstab-generator: simplify return code generation (diff) | |
| download | systemd-9b69569d2cc5b7a5a2b6753f53fab120b3610725.tar.xz systemd-9b69569d2cc5b7a5a2b6753f53fab120b3610725.zip | |
Pull in systemd-remount-fs.service only when required
Instead of enabling it unconditionally and then using ConditionPathExists=/etc/fstab,
and possibly masking this condition if it should be enabled for auto gpt stuff,
just pull it in explicitly when required.
Diffstat (limited to 'units')
| -rw-r--r-- | units/meson.build | 3 | ||||
| -rw-r--r-- | units/systemd-remount-fs.service.in | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/units/meson.build b/units/meson.build index d69508467f..3820585051 100644 --- a/units/meson.build +++ b/units/meson.build @@ -186,8 +186,7 @@ in_units = [ ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', 'sysinit.target.wants/'], - ['systemd-remount-fs.service', '', - 'local-fs.target.wants/'], + ['systemd-remount-fs.service', ''], ['systemd-resolved.service', 'ENABLE_RESOLVE', join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in index 2e5b75ec03..4f4304d68e 100644 --- a/units/systemd-remount-fs.service.in +++ b/units/systemd-remount-fs.service.in @@ -16,7 +16,6 @@ Conflicts=shutdown.target After=systemd-fsck-root.service Before=local-fs-pre.target local-fs.target shutdown.target Wants=local-fs-pre.target -ConditionPathExists=/etc/fstab [Service] Type=oneshot |