summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-04-21 14:05:34 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-04-21 14:05:34 +0200
commita95f038521d31e0158fc4115651d035e7482e1a2 (patch)
treebdf96045051be7a82838b1369cdbbb7c36a98317
parentb466e9ab3951207a3c0c8d2ba6167be1eac1e41a (diff)
udevd, udev-event: sync waitpid() error handling
-rw-r--r--NEWS3
-rw-r--r--udev/udev-event.c14
-rw-r--r--udev/udevd.c31
3 files changed, 30 insertions, 18 deletions
diff --git a/NEWS b/NEWS
index 27be44c5a8..89b5b9c39a 100644
--- a/NEWS
+++ b/NEWS
@@ -2,11 +2,12 @@ udev 168
========
Bugfixes.
-warning if /run is not writable.
+warning if /run is not writable
udevadm control --exit
udevadm info --cleanup-db
+if used, OPTIONS+="db_persist" needed for LVM
systemd netlink socket activation
stop socket or mask on rpm update
diff --git a/udev/udev-event.c b/udev/udev-event.c
index ef21ce8f6b..4af3e08f60 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -660,7 +660,7 @@ static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
goto out;
}
if (fdcount == 0) {
- err(udev, "timeout: killing '%s'[%u]\n", cmd, pid);
+ err(udev, "timeout: killing '%s' [%u]\n", cmd, pid);
kill(pid, SIGKILL);
}
@@ -681,14 +681,20 @@ static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
if (waitpid(pid, &status, WNOHANG) < 0)
break;
if (WIFEXITED(status)) {
- info(udev, "'%s'[%u] returned with exitcode %i\n", cmd, pid, WEXITSTATUS(status));
+ info(udev, "'%s' [%u] exit with return code %i\n", cmd, pid, WEXITSTATUS(status));
if (WEXITSTATUS(status) != 0)
err = -1;
} else if (WIFSIGNALED(status)) {
- err(udev, "'%s'[%u] terminated by signal %i\n", cmd, pid, WTERMSIG(status));
+ err(udev, "'%s' [%u] terminated by signal %i (%s)\n", cmd, pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+ err = -1;
+ } else if (WIFSTOPPED(status)) {
+ err(udev, "'%s' [%u] stopped\n", cmd, pid);
+ err = -1;
+ } else if (WIFCONTINUED(status)) {
+ err(udev, "'%s' [%u] continued\n", cmd, pid);
err = -1;
} else {
- err(udev, "'%s'[%u] unexpected exit with status 0x%04x\n", cmd, pid, status);
+ err(udev, "'%s' [%u] exit with status 0x%04x\n", cmd, pid, status);
err = -1;
}
pid = 0;
diff --git a/udev/udevd.c b/udev/udevd.c
index 0e73f81069..be4b071ebb 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -809,24 +809,29 @@ static void handle_signal(struct udev *udev, int signo)
if (worker->pid != pid)
continue;
-
info(udev, "worker [%u] exit\n", pid);
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
- if (WEXITSTATUS(status))
- err(udev, "worker [%u] unexpectedly returned with status %d\n", pid, WEXITSTATUS(status));
- else if (WIFSIGNALED(status))
- err(udev, "worker [%u] killed by signal %d (%s)\n", pid,
- WTERMSIG(status), strsignal(WTERMSIG(status)));
- else if (WIFSTOPPED(status))
- err(udev, "worker [%u] unexpectedly stopped\n", pid);
- else if (WIFCONTINUED(status))
- err(udev, "worker [%u] continued\n", pid);
+ if (WIFEXITED(status)) {
+ if (WEXITSTATUS(status) != 0)
+ err(udev, "worker [%u] exit with return code %i\n", pid, WEXITSTATUS(status));
+ } else if (WIFSIGNALED(status)) {
+ err(udev, "worker [%u] terminated by signal %i (%s)\n",
+ pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+ } else if (WIFSTOPPED(status)) {
+ err(udev, "worker [%u] stopped\n", pid);
+ } else if (WIFCONTINUED(status)) {
+ err(udev, "worker [%u] continued\n", pid);
+ } else {
+ err(udev, "worker [%u] exit with status 0x%04x\n", pid, status);
+ }
+
+ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
if (worker->event != NULL) {
- err(udev, "worker [%u] failed while handling '%s'\n", pid, worker->event->devpath);
+ err(udev, "worker [%u] failed while handling '%s'\n",
+ pid, worker->event->devpath);
worker->event->exitcode = -32;
event_queue_delete(worker->event, true);
- /* drop reference from running event */
+ /* drop reference taken for state 'running' */
worker_unref(worker);
}
}