Re: Test script for udevd binary, Request for Comments!

[Kay Sievers <kay.sievers@vrfy.org>]

[-- Attachment #1: Type: text/plain, Size: 438 bytes --]

On Fri, Apr 09, 2004 at 10:45:40AM +0000, Nick Yin wrote:
> Kay,
> 
> Thank you very much for giving me so much suggestion. I will modify this 
> test script following your suggestion. :-)

Nick,
here is the needed change for udevd. You can start udevd in your test
script with a specified UDEV_BIN in the environment. If we get a nice
udevd test script, we can merge the change in the main tree along with
your script :)

good luck,
Kay

[-- Attachment #2: 01-udev_bin-override.patch --]
[-- Type: text/plain, Size: 1092 bytes --]

===== udevd.c 1.30 vs edited =====
--- 1.30/udevd.c	Fri Apr  2 22:48:21 2004
+++ edited/udevd.c	Fri Apr  9 22:12:22 2004
@@ -60,6 +60,7 @@
 static void msg_queue_manager(void);
 static void user_sighandler(void);
 static void reap_kids(void);
+char *udev_bin;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -146,7 +147,7 @@
 	switch (pid) {
 	case 0:
 		/* child */
-		execle(UDEV_BIN, "udev", msg->subsystem, NULL, env);
+		execle(udev_bin, "udev", msg->subsystem, NULL, env);
 		dbg("exec of child failed");
 		exit(1);
 		break;
@@ -399,6 +400,7 @@
 	const int on = 1;
 	struct sigaction act;
 	fd_set readfds;
+	char *s;
 
 	init_logging("udevd");
 	dbg("version %s", UDEV_VERSION);
@@ -457,6 +459,15 @@
 
 	/* enable receiving of the sender credentials */
 	setsockopt(ssock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
+
+	/* possible override of udev binary, used for testing */
+	s = getenv("UDEV_BIN");
+	if (s != NULL) {
+		udev_bin = s;
+		dbg("udev binary is set to '%s'", udev_bin);
+	} else {
+		udev_bin = UDEV_BIN;
+	}
 
 	FD_ZERO(&readfds);
 	FD_SET(ssock, &readfds);