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

diff --git a/NEWS b/NEWS
index 6f4afd3d2b5150c8822eaa1d010de2f3a670f982..82955f9095b52109e554c662c868424068c081bc 100644 (file)
--- 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 1b887aea3f63336444ba0be5c1fd242e850843dc..3f3b01852b53f47f27ef555ee30626c99f0e3df4 100644 (file)
--- 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);