-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
static const char * const kmod_table[] = {
"autofs4", "/sys/class/misc/autofs",
- "ipv6", "/sys/module/ipv6"
+ "ipv6", "/sys/module/ipv6",
+ "unix", "/proc/net/unix"
};
int kmod_setup(void) {
ExecCommand command;
ExecContext context;
pid_t pid;
- int status, r;
+ int r;
+ siginfo_t status;
for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) {
if (access(kmod_table[i+1], F_OK) >= 0)
continue;
- log_info("Your kernel apparently lacks built-in %s support. Please fix that. "
- "We'll now try to work around this by calling '/sbin/modprobe %s'...",
- kmod_table[i], kmod_table[i]);
+ log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. "
+ "We'll now try to work around this by calling '/sbin/modprobe %s'...",
+ kmod_table[i], kmod_table[i]);
cmdline[3 + n++] = kmod_table[i];
}
command.argv = (char**) cmdline;
exec_context_init(&context);
- r = exec_spawn(&command, NULL, &context, NULL, 0, NULL, false, false, false, NULL, &pid);
+ r = exec_spawn(&command, NULL, &context, NULL, 0, NULL, false, false, false, false, NULL, &pid);
exec_context_done(&context);
if (r < 0)
return r;
- for (;;) {
- if (waitpid(pid, &status, 0) < 0) {
+ if ((r = wait_for_terminate(pid, &status)) < 0)
+ return -errno;
- if (errno == EINTR)
- continue;
-
- return -errno;
- }
-
- break;
- }
-
- if (WIFEXITED(status)) {
- if (WEXITSTATUS(status) != 0) {
- log_warning("/sbin/modprobe failed with error code %i.", WEXITSTATUS(status));
+ 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;
- }
- if (WIFSIGNALED(status)) {
- log_warning("/sbin/modprobe terminated by signal %s.", strsignal(WTERMSIG(status)));
+ } 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;
}