chiark / gitweb /
modules-load: fix kernel cmdline parsing
[elogind.git] / src / modules-load / modules-load.c
index 0e4dca499780192656a83033d4d500cef315b745..d6bc16d34086b140b5ea7c98d68b439bd188fd3d 100644 (file)
@@ -41,7 +41,7 @@ static char **arg_proc_cmdline_modules = NULL;
 static void systemd_kmod_log(void *data, int priority, const char *file, int line,
                              const char *fn, const char *format, va_list args)
 {
-        log_meta(priority, file, line, fn, format, args);
+        log_metav(priority, file, line, fn, format, args);
 }
 #pragma GCC diagnostic pop
 
@@ -90,16 +90,16 @@ static int parse_proc_cmdline(void) {
                         goto finish;
                 }
 
-                if (startswith(word, "driver=")) {
+                if (startswith(word, "modules-load=")) {
 
-                        r = add_modules(word + 7);
+                        r = add_modules(word + 13);
                         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);
+                                r = add_modules(word + 16);
                                 if (r < 0)
                                         goto finish;
                         }