units: In MeeGo there was more than one ExecStart lines present that caused systemd...

[elogind.git] / units / systemd-modules-load.service.in

diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 1eb49011f50b835bb9636230f095f53a5bfdd7b4..5dc373d208e3f460e9d973b2e264562825846b3b 100644 (file)
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -10,7 +10,12 @@ Description=Load Kernel Modules
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=shutdown.target
+Before=sysinit.target shutdown.target
+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