X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fkmod-setup.c;h=c0a05b97aac87b7bf74fed1993d2517b82fe40bf;hp=50af7932f636b559f9d8e6649a6920455067473e;hb=3da44ef53b949021e960d6169e809e297f2b7f65;hpb=086891e5c119abb9854237fc32e736fe2d67234c diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 50af7932f..c0a05b97a 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -44,30 +44,12 @@ static void systemd_kmod_log( /* library logging is enabled at debug only */ DISABLE_WARNING_FORMAT_NONLITERAL; - log_metav(LOG_DEBUG, 0, file, line, fn, format, args); + log_internalv(LOG_DEBUG, 0, file, line, fn, format, args); REENABLE_WARNING; } static bool cmdline_check_kdbus(void) { - _cleanup_free_ char *line = NULL; - const char *p; - int r; - - r = proc_cmdline(&line); - if (r < 0) - return false; - - p = line; - for (;;) { - _cleanup_free_ char *word = NULL; - - r = unquote_first_word(&p, &word, true); - if (r <= 0) - return false; - - if (streq(word, "kdbus")) - return true; - } + return get_proc_cmdline_key("kdbus", NULL) > 0; } #endif