diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-30 23:08:15 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-30 23:08:15 +0200 |
| commit | adf70c5e4e6673353b8d702baee4e1d21eb05dfe (patch) | |
| tree | 10681a46d779073e26624cf5297516667aacd3b1 /units | |
| parent | 223a35581604897185c46dfc184b0fa32916d59b (diff) | |
binfmt, modules-load, sysctl, tmpfiles: add missing ConditionDirectoryNotEmpty=
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-binfmt.service.in | 5 | ||||
| -rw-r--r-- | units/systemd-modules-load.service.in | 6 | ||||
| -rw-r--r-- | units/systemd-sysctl.service.in | 4 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-clean.service.in | 5 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-setup.service.in | 5 |
5 files changed, 21 insertions, 4 deletions
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in index 0bf6df201..d43497c15 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -11,7 +11,10 @@ DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount Before=sysinit.target shutdown.target -ConditionDirectoryNotEmpty=/etc/binfmt.d +ConditionDirectoryNotEmpty=|/usr/lib/binfmt.d +ConditionDirectoryNotEmpty=|/usr/local/lib/binfmt.d +ConditionDirectoryNotEmpty=|/etc/binfmt.d +ConditionDirectoryNotEmpty=|/run/binfmt.d [Service] Type=oneshot diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in index 739729e69..5dc373d20 100644 --- a/units/systemd-modules-load.service.in +++ b/units/systemd-modules-load.service.in @@ -11,7 +11,11 @@ DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target -ConditionDirectoryNotEmpty=/etc/modules-load.d +ConditionDirectoryNotEmpty=|/lib/modules-load.d +ConditionDirectoryNotEmpty=|/usr/lib/modules-load.d +ConditionDirectoryNotEmpty=|/usr/local/lib/modules-load.d +ConditionDirectoryNotEmpty=|/etc/modules-load.d +ConditionDirectoryNotEmpty=|/run/modules-load.d [Service] Type=oneshot diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in index ea78230d7..6d5342263 100644 --- a/units/systemd-sysctl.service.in +++ b/units/systemd-sysctl.service.in @@ -12,7 +12,11 @@ Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target ConditionPathExists=|/etc/sysctl.conf +ConditionDirectoryNotEmpty=|/lib/sysctl.d +ConditionDirectoryNotEmpty=|/usr/lib/sysctl.d +ConditionDirectoryNotEmpty=|/usr/local/lib/sysctl.d ConditionDirectoryNotEmpty=|/etc/sysctl.d +ConditionDirectoryNotEmpty=|/run/sysctl.d [Service] Type=oneshot diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in index 002daf661..3c8e72ebf 100644 --- a/units/systemd-tmpfiles-clean.service.in +++ b/units/systemd-tmpfiles-clean.service.in @@ -11,7 +11,10 @@ DefaultDependencies=no Wants=local-fs.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target Before=sysinit.target shutdown.target -ConditionPathExists=/etc/tmpfiles.d +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 b43f6f5a0..f90121e12 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -11,7 +11,10 @@ DefaultDependencies=no Wants=local-fs.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target Before=sysinit.target shutdown.target -ConditionPathExists=/etc/tmpfiles.d +ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d +ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d +ConditionDirectoryNotEmpty=|/etc/tmpfiles.d +ConditionDirectoryNotEmpty=|/run/tmpfiles.d [Service] Type=oneshot |