diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-06-13 12:22:04 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-06-13 13:26:32 +0200 |
| commit | db62b5b37e7d9ebf7d6b8f2709e6a51bbf8f77ee (patch) | |
| tree | 6f9a92fde339a7deb9845bd2a163e9dd690886ed /units | |
| parent | 9194c8e4c3a85e098799b3096fe65d1aced02fd4 (diff) | |
units: remove conditions from systemd-tmpfiles-setup
There's no point in conditionalizing systemd-tmpfiles at boot, since we
ship tmpfiles snippets ourselves, hence they will always trigger anyway.
Also, there's no reason to pull in local-fs.target from the service,
hence drop that.
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-tmpfiles-clean.service.in | 5 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-setup.service.in | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in index a5b5acb0c2..5946fcdd8e 100644 --- a/units/systemd-tmpfiles-clean.service.in +++ b/units/systemd-tmpfiles-clean.service.in @@ -9,13 +9,8 @@ Description=Cleanup of Temporary Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no -Wants=local-fs.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target Before=sysinit.target shutdown.target -ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d -ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d -ConditionDirectoryNotEmpty=|/etc/tmpfiles.d -ConditionDirectoryNotEmpty=|/run/tmpfiles.d [Service] Type=oneshot diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in index 01043b7a96..747c9a8d65 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -9,15 +9,9 @@ Description=Create Volatile Files and Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no -Wants=local-fs.target Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target Before=sysinit.target shutdown.target -ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d -ConditionDirectoryNotEmpty=|/lib/tmpfiles.d -ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d -ConditionDirectoryNotEmpty=|/etc/tmpfiles.d -ConditionDirectoryNotEmpty=|/run/tmpfiles.d RefuseManualStart=yes RefuseManualStop=yes |