From: Kay Sievers <kay@vrfy.org>
Date: Mon, 2 Jul 2012 13:05:26 +0000 (+0200)
Subject: modules load: rename kernel command line option to (rd.)modules-load=
X-Git-Tag: v186~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=91ac74250149a29122b2291c5393dec4592430d4;p=elogind.git

modules load: rename kernel command line option to (rd.)modules-load=
---

diff --git a/NEWS b/NEWS
index 6f4afd3d2..82955f909 100644
--- a/NEWS
+++ b/NEWS
@@ -81,7 +81,7 @@ CHANGES WITH 186:
         * The fstab generator may now be disabled at boot by passing
           fstab=0 on the kernel command line.
 
-        * A new kernel command line option driver= is now understood
+        * A new kernel command line option modules-load= is now understood
           to load a specific kernel module statically, early at boot.
 
         * Unit names specified on the systemctl command line are now
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 1b887aea3..3f3b01852 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -90,13 +90,13 @@ static int parse_proc_cmdline(void) {
                         goto finish;
                 }
 
-                if (startswith(word, "driver=")) {
+                if (startswith(word, "modules-load=")) {
 
                         r = add_modules(word + 7);
                         if (r < 0)
                                 goto finish;
 
-                } else if (startswith(word, "rd.driver=")) {
+                } else if (startswith(word, "rd.modules-load=")) {
 
                         if (in_initrd()) {
                                 r = add_modules(word + 10);