X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=3adedac0807b722cd9c9b38dc665387feff33de0;hp=df6e2228106173db10212ee025cb1184bb633f6b;hb=c7c00276f6f26ff7f38e99d887137bc1f172a978;hpb=b52a01ee39dad3b04aaa7e3af7435f062d3e887f

diff --git a/udevd.c b/udevd.c
index df6e22281..3adedac08 100644
--- a/udevd.c
+++ b/udevd.c
@@ -45,6 +45,9 @@
 #include "udevd.h"
 #include "udev_selinux.h"
 
+static int debug_trace;
+static int verbose;
+
 static struct udev_rules rules;
 static int udevd_sock = -1;
 static int uevent_netlink_sock = -1;
@@ -76,6 +79,13 @@ void log_message(int priority, const char *format, ...)
 	va_start(args, format);
 	vsyslog(priority, format, args);
 	va_end(args);
+
+	if (verbose) {
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+		printf("\n");
+	}
 }
 
 #endif
@@ -298,6 +308,15 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 
 	export_event_state(msg, EVENT_QUEUED);
 
+	/* run one event after the other in debug mode */
+	if (debug_trace) {
+		list_add_tail(&msg->node, &running_list);
+		udev_event_run(msg);
+		waitpid(msg->pid, NULL, 0);
+		msg_queue_delete(msg);
+		return;
+	}
+
 	/* run all events with a timeout set immediately */
 	if (msg->timeout != 0) {
 		list_add_tail(&msg->node, &running_list);
@@ -921,6 +940,8 @@ int main(int argc, char *argv[], char *envp[])
 	int option;
 	static const struct option options[] = {
 		{ "daemon", 0, NULL, 'd' },
+		{ "debug-trace", 0, NULL, 't' },
+		{ "verbose", 0, NULL, 'v' },
 		{ "help", 0, NULL, 'h' },
 		{}
 	};
@@ -942,8 +963,16 @@ int main(int argc, char *argv[], char *envp[])
 		case 'd':
 			daemonize = 1;
 			break;
+		case 't':
+			debug_trace = 1;
+			break;
+		case 'v':
+			verbose = 1;
+			if (udev_log_priority < LOG_INFO)
+				udev_log_priority = LOG_INFO;
+			break;
 		case 'h':
-			printf("Usage: udevd [--help] [--daemon]\n");
+			printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--verbose]\n");
 			goto exit;
 		default:
 			goto exit;
@@ -1006,7 +1035,8 @@ int main(int argc, char *argv[], char *envp[])
 	fd = open("/dev/null", O_RDWR);
 	if (fd >= 0) {
 		dup2(fd, STDIN_FILENO);
-		dup2(fd, STDOUT_FILENO);
+		if (!verbose)
+			dup2(fd, STDOUT_FILENO);
 		dup2(fd, STDERR_FILENO);
 		if (fd > STDERR_FILENO)
 			close(fd);
@@ -1112,6 +1142,8 @@ int main(int argc, char *argv[], char *envp[])
 	/* export log_priority , as called programs may want to follow that setting */
 	sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
 	putenv(udev_log);
+	if (debug_trace)
+		putenv("DEBUG=1");
 
 	maxfd = udevd_sock;
 	maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);