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=243afadc83ec2461d49360b597c69eb825032c1d;hp=59482953fc91a3ba9f1e7e31652b1502eba5c58d;hb=5cd6eef69b926175b889799d80bd9deb33a904d1;hpb=f3c15784a118757b2511cb73d8c5c84a14ab4bc2

diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 59482953f..243afadc8 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -1,8 +1,8 @@
 #  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]
@@ -10,7 +10,13 @@ Description=Load Kernel Modules
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=basic.target shutdown.target
+Before=sysinit.target shutdown.target
+ConditionCapability=CAP_SYS_MODULE
+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