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

diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 2390e02b3..72e1d70dc 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -1,19 +1,23 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
 [Unit]
 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