core: either ignore or handle mount failures

[elogind.git] / src / core / kmod-setup.c

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index 019858f092831b854d15f8551240f00665c565e0..efbdf31688cd56d8dd52abdcd899c39b4eb898e4 100644 (file)
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -19,17 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/wait.h>
 #include <unistd.h>
 #include <string.h>
-#include <errno.h>
 
 #ifdef HAVE_KMOD
 #include <libkmod.h>
 #endif
 
 #include "macro.h"
-#include "execute.h"
 #include "capability.h"
 #include "kmod-setup.h"
 
@@ -49,25 +46,7 @@ static void systemd_kmod_log(
 }
 
 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