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=efbdf31688cd56d8dd52abdcd899c39b4eb898e4;hp=4795a47eb4b87b172b66878464cad2024ede847a;hb=3164e3cbc50b8754c51f1fdeda7a7d6cedcc39b6;hpb=68d4c4526306cf464257aed269b21a73672bbe29
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 4795a47eb..efbdf3168 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -19,17 +19,14 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
#ifdef HAVE_KMOD
#include
#endif
#include "macro.h"
-#include "execute.h"
#include "capability.h"
#include "kmod-setup.h"
@@ -44,30 +41,12 @@ static void systemd_kmod_log(
/* library logging is enabled at debug only */
DISABLE_WARNING_FORMAT_NONLITERAL;
- log_metav(LOG_DEBUG, 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