X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fsystemd-modules-load.service.in;h=5dc373d208e3f460e9d973b2e264562825846b3b;hp=2390e02b3f6e624d97cfa941cdcfb211b89f4847;hb=19c5f19d69bb5f520fa7213239490c55de06d99d;hpb=b2423f1f436f847d9fc96a63679be2b5552b6baf

diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 2390e02b3..5dc373d20 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -9,11 +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