summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2012-07-25 08:48:50 +0200
committerMichal Schmidt <mschmidt@redhat.com>2012-07-25 08:51:41 +0200
commit22cfbae09d7791c52901c53b240e28c63eee93d4 (patch)
tree44edca481c937dd6a09249f4dea8566e1cfe4d76
parentb2fc39a6838f08e6050b681e0c93f95bc6176786 (diff)
downloadsystemd-22cfbae09d7791c52901c53b240e28c63eee93d4.tar.gz
systemd-22cfbae09d7791c52901c53b240e28c63eee93d4.tar.bz2
systemd-22cfbae09d7791c52901c53b240e28c63eee93d4.zip
units: add the modules-load cmdline parameters to the unit conditions
For 'modules-load=' and 'rd.modules-load=' to be effective, systemd-modules-load.service must be started. It is currently conditional on the existence of config files. Add the presence of the cmdline parameters to the triggering conditions.
-rw-r--r--units/systemd-modules-load.service.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index ff6613f81a..32deb52e26 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -18,6 +18,8 @@ ConditionDirectoryNotEmpty=|/usr/lib/modules-load.d
ConditionDirectoryNotEmpty=|/usr/local/lib/modules-load.d
ConditionDirectoryNotEmpty=|/etc/modules-load.d
ConditionDirectoryNotEmpty=|/run/modules-load.d
+ConditionKernelCommandLine=|modules-load
+ConditionKernelCommandLine=|rd.modules-load
[Service]
Type=oneshot