From: Harald Hoyer <harald@redhat.com>
Date: Wed, 9 Mar 2011 20:51:16 +0000 (+0100)
Subject: rd.driver.*: accept comma separated list
X-Git-Tag: 009~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c4c8b72395872dfb8c01549f33f7a9fc043f56d;p=thirdparty%2Fdracut.git

rd.driver.*: accept comma separated list

accept a comma seperated list of kernel drivers for
rd.driver.blacklist
rd.driver.pre
rd.driver.post
---

diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml
index 2b0d09c82..da4a77675 100644
--- a/dracut.kernel.7.xml
+++ b/dracut.kernel.7.xml
@@ -84,7 +84,7 @@ accordingly.</para>
       <variablelist>
         <varlistentry>
           <term>
-            <envar>rd.driver.blacklist=<replaceable>&lt;drivername&gt;</replaceable></envar>
+            <envar>rd.driver.blacklist=<replaceable>&lt;drivername&gt;<optional>,&lt;drivername&gt;,...</optional></replaceable></envar>
           </term>
           <listitem>
             <para>do not load kernel module &lt;drivername&gt;
@@ -93,13 +93,21 @@ This parameter can be specified multiple times.</para>
         </varlistentry>
         <varlistentry>
           <term>
-            <envar>rd.driver.pre=<replaceable>&lt;drivername&gt;</replaceable></envar>
+            <envar>rd.driver.pre=<replaceable>&lt;drivername&gt;<optional>,&lt;drivername&gt;,...</optional></replaceable></envar>
           </term>
           <listitem>
             <para>force loading kernel module &lt;drivername&gt;
 This parameter can be specified multiple times.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term>
+            <envar>rd.driver.post=<replaceable>&lt;drivername&gt;<optional>,&lt;drivername&gt;,...</optional></replaceable></envar>
+          </term>
+          <listitem>
+	    <para>force loading kernel module &lt;drivername&gt; after all automatic loading modules have been loaded. This parameter can be specified multiple times.</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </refsect2>
     <refsect2 id="dracut-kernel-debug">
diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh
index 509bbcf32..cc84b5539 100755
--- a/modules.d/90kernel-modules/parse-kernel.sh
+++ b/modules.d/90kernel-modules/parse-kernel.sh
@@ -3,5 +3,11 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 for p in $(getargs rd.loaddriver rdloaddriver=); do 
-    modprobe $p
+    ( 
+        IFS=,
+        for p in $i; do 
+            modprobe $p 2>&1 | vinfo
+        done
+    )
 done
+
diff --git a/modules.d/96insmodpost/insmodpost.sh b/modules.d/96insmodpost/insmodpost.sh
index 1571c3e8d..92d7e196a 100755
--- a/modules.d/96insmodpost/insmodpost.sh
+++ b/modules.d/96insmodpost/insmodpost.sh
@@ -4,5 +4,10 @@
 . /lib/dracut-lib.sh
 
 for p in $(getargs rd.insmodpost rdinsmodpost=); do 
-    modprobe $p
+    (
+        IFS=,
+        for p in $i; do 
+            modprobe $p
+        done
+    )
 done
diff --git a/modules.d/99base/parse-blacklist.sh b/modules.d/99base/parse-blacklist.sh
index ae8c5f0c2..79e10dcac 100755
--- a/modules.d/99base/parse-blacklist.sh
+++ b/modules.d/99base/parse-blacklist.sh
@@ -3,5 +3,10 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 for p in $(getargs rd.module.blacklist rdblacklist=); do 
-    echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
+    (
+        IFS=,
+        for p in $i; do 
+            echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
+        done
+    )
 done