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

diff --git a/udev/udevd.c b/udev/udevd.c
index 258d7870e..f1a31e7af 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -55,13 +55,12 @@ static void log_fn(struct udev *udev, int priority,
 {
 	if (debug) {
 		char buf[1024];
-		struct timeval tv;
-		struct timezone tz;
+		struct timespec ts;
 
 		vsnprintf(buf, sizeof(buf), format, args);
-		gettimeofday(&tv, &tz);
-		fprintf(stderr, "%llu.%06u [%u] %s: %s",
-			(unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+		fprintf(stderr, "[%llu.%06u] [%u] %s: %s",
+			(unsigned long long) ts.tv_sec, (unsigned int) ts.tv_nsec/1000,
 			(int) getpid(), fn, buf);
 	} else {
 		vsyslog(priority, format, args);
@@ -365,9 +364,6 @@ static void worker_new(struct event *event)
 						switch (fdsi.ssi_signo) {
 						case SIGTERM:
 							goto out;
-						case SIGALRM:
-							rc = EXIT_FAILURE;
-							goto out;
 						}
 					}
 				}
@@ -893,10 +889,11 @@ static void static_dev_create_from_modules(struct udev *udev)
 		if (sscanf(devno, "%c%u:%u", &type, &maj, &min) != 3)
 			continue;
 
+		/* set sticky bit, so we do not remove the node on module unload */
 		if (type == 'c')
-			mode = 0600 | S_IFCHR;
+			mode = 01600|S_IFCHR;
 		else if (type == 'b')
-			mode = 0600 | S_IFBLK;
+			mode = 01600|S_IFBLK;
 		else
 			continue;
 
@@ -1578,8 +1575,8 @@ int main(int argc, char *argv[])
 
 	udev_rules_apply_static_dev_perms(rules);
 
-	udev_list_init(&event_list);
-	udev_list_init(&worker_list);
+	udev_list_node_init(&event_list);
+	udev_list_node_init(&worker_list);
 
 	for (;;) {
 		struct epoll_event ev[8];
@@ -1610,12 +1607,12 @@ int main(int argc, char *argv[])
 			worker_kill(udev, 0);
 
 			/* exit after all has cleaned up */
-			if (udev_list_is_empty(&event_list) && udev_list_is_empty(&worker_list))
+			if (udev_list_node_is_empty(&event_list) && udev_list_node_is_empty(&worker_list))
 				break;
 
 			/* timeout at exit for workers to finish */
 			timeout = 60 * 1000;
-		} else if (udev_list_is_empty(&event_list) && children > 2) {
+		} else if (udev_list_node_is_empty(&event_list) && children > 2) {
 			/* set timeout to kill idle workers */
 			timeout = 3 * 1000;
 		} else {
@@ -1663,7 +1660,7 @@ int main(int argc, char *argv[])
 		}
 
 		/* start new events */
-		if (!udev_list_is_empty(&event_list) && !udev_exit && !stop_exec_queue)
+		if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue)
 			event_queue_start(udev);
 
 		if (is_signal) {