X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=4c51ed58e58ff33fb9cad7b02e2aca43966ea979;hb=16efbde01ada6869c41426af673550bb7ddbebf8;hp=ef21ce8f6b1a5d774309226586fdbd49cf47c56b;hpb=c7be212dbd21bca5ec041697109c63c6277d5425;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index ef21ce8f6..4c51ed58e 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
 	udev_list_init(&event->run_list);
 	event->fd_signal = -1;
 	event->birth_usec = now_usec();
-	event->timeout_usec = 120 * 1000 * 1000;
+	event->timeout_usec = 60 * 1000 * 1000;
 	dbg(event->udev, "allocated event %p\n", event);
 	return event;
 }
@@ -489,7 +489,7 @@ static int spawn_exec(struct udev_event *event,
 
 	/* exec failed */
 	err = -errno;
-	err(udev, "exec of program '%s' failed\n", cmd);
+	err(udev, "failed to execute '%s' '%s': %m\n", argv[0], cmd);
 	return err;
 }
 
@@ -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;
@@ -1069,7 +1075,7 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
 			udev_event_apply_format(event, cmd, program, sizeof(program));
 			envp = udev_device_get_properties_envp(event->dev);
 			if (udev_event_spawn(event, program, envp, sigmask, NULL, 0) < 0) {
-				if (udev_list_entry_get_flags(list_entry))
+				if (udev_list_entry_get_num(list_entry))
 					err = -1;
 			}
 		}