From: Michal Schmidt <mschmidt@redhat.com>
Date: Wed, 25 Jul 2012 06:48:50 +0000 (+0200)
Subject: units: add the modules-load cmdline parameters to the unit conditions
X-Git-Tag: v188~92
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=22cfbae09d7791c52901c53b240e28c63eee93d4;p=elogind.git

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.
---

diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index ff6613f81..32deb52e2 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