X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fkmod-setup.c;h=7bd7dcb182ed8795dad52927342ef1a4e37e1e7a;hp=44d843db12ad0774a580019853ae31a3e961940c;hb=55d7bfc19b72eca09d2bb7c9c73a62c886d8b9b4;hpb=8e12a6aed3d99ac8c140cd56b560f5efeb1c4e1a

diff --git a/src/kmod-setup.c b/src/kmod-setup.c
index 44d843db1..7bd7dcb18 100644
--- a/src/kmod-setup.c
+++ b/src/kmod-setup.c
@@ -42,7 +42,6 @@ int kmod_setup(void) {
         ExecContext context;
         pid_t pid;
         int r;
-        siginfo_t status;
 
         for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) {
 
@@ -71,31 +70,13 @@ int kmod_setup(void) {
         command.argv = (char**) cmdline;
 
         exec_context_init(&context);
-        r = exec_spawn(&command, NULL, &context, NULL, 0, NULL, false, false, false, false, NULL, &pid);
+        r = exec_spawn(&command, NULL, &context, NULL, 0, NULL, false, false, false, false, NULL, NULL, &pid);
         exec_context_done(&context);
 
-        if (r < 0)
+        if (r < 0) {
+                log_error("Failed to spawn %s: %s", cmdline[0], strerror(-r));
                 return r;
-
-        if ((r = wait_for_terminate(pid, &status)) < 0)
-                return -errno;
-
-        if (status.si_code == CLD_EXITED) {
-                if (status.si_status != 0) {
-                        log_warning("/sbin/modprobe failed with error code %i.", status.si_status);
-                        return -EPROTO;
-                }
-
-                log_debug("/sbin/modprobe succeeded.");
-                return 0;
-
-        } else if (status.si_code == CLD_KILLED ||
-                   status.si_code == CLD_DUMPED) {
-
-                log_warning("/sbin/modprobe terminated by signal %s.", signal_to_string(status.si_status));
-                return -EPROTO;
         }
 
-        log_warning("/sbin/modprobe failed due to unknown reason.");
-        return -EPROTO;
+        return wait_for_terminate_and_warn(cmdline[0], pid);
 }