From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Nov 2010 19:10:04 +0000 (+0100)
Subject: units: use ConditionDirectoryNotEmpty= where applicable
X-Git-Tag: v12~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5319832c4cbec4c9569adf1a4512cc620ddc58a;p=thirdparty%2Fsystemd.git

units: use ConditionDirectoryNotEmpty= where applicable
---

diff --git a/TODO b/TODO
index 287de70acea..57306863587 100644
--- a/TODO
+++ b/TODO
@@ -79,8 +79,6 @@
 
 * declare /etc/os-release cross-distro standard
 
-* add ConditionDirectoryNotEmpty=
-
 Pre v12:
 
 * fix hotplug transactions
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 59482953fc9..612338b619b 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -11,6 +11,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=basic.target shutdown.target
+ConditionDirectoryNotEmpty=/etc/modules-load.d
 
 [Service]
 Type=oneshot