nspawn: add --image= switch to boot GPT disk images that follow the Discoverable...

[elogind.git] / src / modules-load / modules-load.c

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index c3aa4094467abcf37c8996015f8864dc580516b5..49b153d411373daf5f549b4c168be52a6db456d5 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -48,13 +48,13 @@ static const char conf_file_dirs[] =
 #endif
         ;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static void systemd_kmod_log(void *data, int priority, const char *file, int line,
                              const char *fn, const char *format, va_list args) {
+
+        DISABLE_WARNING_FORMAT_NONLITERAL;
         log_metav(priority, file, line, fn, format, args);
+        REENABLE_WARNING;
 }
-#pragma GCC diagnostic pop
 
 static int add_modules(const char *p) {
         _cleanup_strv_free_ char **k = NULL;
@@ -69,20 +69,13 @@ static int add_modules(const char *p) {
         return 0;
 }
 
-static int parse_proc_cmdline_word(const char *word) {
+static int parse_proc_cmdline_item(const char *key, const char *value) {
         int r;
 
-        if (startswith(word, "modules-load=")) {
-                r = add_modules(word + 13);
+        if (STR_IN_SET(key, "modules-load", "rd.modules-load") && value) {
+                r = add_modules(value);
                 if (r < 0)
                         return r;
-
-        } else if (startswith(word, "rd.modules-load=")) {
-                if (in_initrd()) {
-                        r = add_modules(word + 16);
-                        if (r < 0)
-                                return r;
-                }
         }
 
         return 0;
@@ -253,7 +246,7 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
+        if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
                 return EXIT_FAILURE;
 
         ctx = kmod_new(NULL, NULL);