X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fsystemd-modules-load.service.in;h=5dc373d208e3f460e9d973b2e264562825846b3b;hp=7a94040fae5db9f09dab3fb421470f30aee8f6e9;hb=4f38cd85f638fdfe59fc34c01827310835365d94;hpb=449ddb2d23a63ca4c8cd70d13a070fba87c1fb30

diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 7a94040fa..5dc373d20 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -9,12 +9,15 @@
 Description=Load Kernel Modules
 DefaultDependencies=no
 Conflicts=shutdown.target
-Before=shutdown.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
+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
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-modules-load
-
-[Install]
-WantedBy=sysinit.target