binfmt, modules-load, sysctl, tmpfiles: add missing ConditionDirectoryNotEmpty=

7 files changed, 23 insertions, 9 deletions

diff --git a/TODO b/TODO
index 1537e2797d..00bbc764e0 100644
--- a/TODO
+++ b/TODO
@@ -35,11 +35,10 @@ Features:
 
 * add inode stat() check to readahead to suppress preloading changed files
 
-* include /usr/local/lib/tmpfiles.d in tmpfiles tool as search path
-  (and prefix/lib, in case it isn't one of the listed ones)
-
 * POSIX mqueue support in .socket units
 
+* allow list of pathes in config_parse_condition_path()
+
 * introduce dbus calls for enabling/disabling a service
 
 * support notifications for services being enabled/disabled
diff --git a/src/path-lookup.c b/src/path-lookup.c
index b1c69814ca..b45467c98d 100644
--- a/src/path-lookup.c
+++ b/src/path-lookup.c
@@ -190,9 +190,7 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
                                               "/run/systemd/system",
                                               SYSTEM_CONFIG_UNIT_PATH,
                                               "/etc/systemd/system",
-                                              "/usr/local/share/systemd/system",
                                               "/usr/local/lib/systemd/system",
-                                              "/usr/share/systemd/system",
                                               "/usr/lib/systemd/system",
                                               "/lib/systemd/system",
                                               SYSTEM_DATA_UNIT_PATH,
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index 0bf6df2011..d43497c151 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 739729e692..5dc373d208 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 ea78230d7c..6d53422630 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 002daf661b..3c8e72ebf5 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 b43f6f5a04..f90121e12e 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