chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: use waitid() instead of waitpid() everywhere to avoid confusion due to SIGSTOP
[elogind.git]
/
src
/
kmod-setup.c
diff --git
a/src/kmod-setup.c
b/src/kmod-setup.c
index fa856c9a6ccc6ceb4447958a85bb2444a2ebe24a..44d843db12ad0774a580019853ae31a3e961940c 100644
(file)
--- a/
src/kmod-setup.c
+++ b/
src/kmod-setup.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-31,7
+31,8
@@
static const char * const kmod_table[] = {
"autofs4", "/sys/class/misc/autofs",
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) {
};
int kmod_setup(void) {
@@
-40,16
+41,17
@@
int kmod_setup(void) {
ExecCommand command;
ExecContext context;
pid_t pid;
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;
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];
}
cmdline[3 + n++] = kmod_table[i];
}
@@
-69,36
+71,28
@@
int kmod_setup(void) {
command.argv = (char**) cmdline;
exec_context_init(&context);
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;
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;
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;
}
return -EPROTO;
}