From db62b5b37e7d9ebf7d6b8f2709e6a51bbf8f77ee Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jun 2014 12:22:04 +0200 Subject: [PATCH] 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. --- units/systemd-tmpfiles-clean.service.in | 5 ----- units/systemd-tmpfiles-setup.service.in | 6 ------ 2 files changed, 11 deletions(-) diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in index a5b5acb0c..5946fcdd8 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 01043b7a9..747c9a8d6 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 -- 2.30.2