X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=d1f7cd8909f26b782f52e7529dbce4a90b72feff;hp=f1a31e7afbb4c767e250cf6f0dd120bf33a28c58;hb=7c2dee4a4d7f1b264031daaee786a8fe429884e1;hpb=79449642ebcb6170adb8d6391518e328a07d9552

diff --git a/udev/udevd.c b/udev/udevd.c
index f1a31e7af..d1f7cd890 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -155,11 +155,7 @@ static void event_queue_delete(struct event *event, bool export)
 	udev_list_node_remove(&event->node);
 
 	if (export) {
-		/* mark as failed, if "add" event returns non-zero */
-		if (event->exitcode != 0 && strcmp(udev_device_get_action(event->dev), "remove") != 0)
-			udev_queue_export_device_failed(udev_queue_export, event->dev);
-		else
-			udev_queue_export_device_finished(udev_queue_export, event->dev);
+		udev_queue_export_device_finished(udev_queue_export, event->dev);
 		info(event->udev, "seq %llu done with %i\n", udev_device_get_seqnum(event->dev), event->exitcode);
 	}
 	udev_device_unref(event->dev);
@@ -284,7 +280,6 @@ static void worker_new(struct event *event)
 		for (;;) {
 			struct udev_event *udev_event;
 			struct worker_message msg;
-			int failed = 0;
 			int err;
 
 			info(udev, "seq %llu running\n", udev_device_get_seqnum(dev));
@@ -304,7 +299,7 @@ static void worker_new(struct event *event)
 			err = udev_event_execute_rules(udev_event, rules, &sigmask_orig);
 
 			if (err == 0)
-				failed = udev_event_execute_run(udev_event, &sigmask_orig);
+				udev_event_execute_run(udev_event, &sigmask_orig);
 
 			/* apply/restore inotify watch */
 			if (err == 0 && udev_event->inotify_watch) {
@@ -319,8 +314,6 @@ static void worker_new(struct event *event)
 			memset(&msg, 0, sizeof(struct worker_message));
 			if (err != 0)
 				msg.exitcode = err;
-			else if (failed != 0)
-				msg.exitcode = failed;
 			msg.pid = getpid();
 			send(worker_watch[WRITE_END], &msg, sizeof(struct worker_message), 0);
 
@@ -354,6 +347,7 @@ static void worker_new(struct event *event)
 				for (i = 0; i < fdcount; i++) {
 					if (ev[i].data.fd == fd_monitor && ev[i].events & EPOLLIN) {
 						dev = udev_monitor_receive_device(worker_monitor);
+						break;
 					} else if (ev[i].data.fd == fd_signal && ev[i].events & EPOLLIN) {
 						struct signalfd_siginfo fdsi;
 						ssize_t size;
@@ -1355,7 +1349,7 @@ int main(int argc, char *argv[])
 
 	if (systemd_fds(udev, &fd_ctrl, &fd_netlink) >= 0) {
 		/* get control and netlink socket from from systemd */
-		udev_ctrl = udev_ctrl_new_from_socket_fd(udev, UDEV_CTRL_SOCK_PATH, fd_ctrl);
+		udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl);
 		if (udev_ctrl == NULL) {
 			err(udev, "error taking over udev control socket");
 			rc = 1;
@@ -1370,7 +1364,7 @@ int main(int argc, char *argv[])
 		}
 	} else {
 		/* open control and netlink socket */
-		udev_ctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
+		udev_ctrl = udev_ctrl_new(udev);
 		if (udev_ctrl == NULL) {
 			fprintf(stderr, "error initializing udev control socket");
 			err(udev, "error initializing udev control socket");
@@ -1426,7 +1420,7 @@ int main(int argc, char *argv[])
 			goto exit;
 		default:
 			rc = EXIT_SUCCESS;
-			goto exit_keep_queue;
+			goto exit_daemonize;
 		}
 
 		setsid();
@@ -1519,6 +1513,8 @@ int main(int argc, char *argv[])
 	}
 	fd_worker = worker_watch[READ_END];
 
+	udev_builtin_load(udev);
+
 	rules = udev_rules_new(udev, resolve_names);
 	if (rules == NULL) {
 		err(udev, "error reading rules\n");
@@ -1654,9 +1650,11 @@ int main(int argc, char *argv[])
 			struct udev_device *dev;
 
 			dev = udev_monitor_receive_device(monitor);
-			if (dev != NULL)
+			if (dev != NULL) {
+				udev_device_set_usec_initialized(dev, now_usec());
 				if (event_queue_insert(dev) < 0)
 					udev_device_unref(dev);
+			}
 		}
 
 		/* start new events */
@@ -1709,12 +1707,14 @@ int main(int argc, char *argv[])
 	rc = EXIT_SUCCESS;
 exit:
 	udev_queue_export_cleanup(udev_queue_export);
-exit_keep_queue:
+	udev_ctrl_cleanup(udev_ctrl);
+exit_daemonize:
 	if (fd_ep >= 0)
 		close(fd_ep);
 	worker_list_cleanup(udev);
 	event_queue_cleanup(udev, EVENT_UNDEF);
 	udev_rules_unref(rules);
+	udev_builtin_unload(udev);
 	if (fd_signal >= 0)
 		close(fd_signal);
 	if (worker_watch[READ_END] >= 0)