X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=5756b46122d0f03037c4b9521679fd53e2b14bab;hp=b2cb62f386c4d7a7b0383161fe629dad963e7eb1;hb=84df02dd63bf53acb5a61e9db1da067760b927e9;hpb=b6bf0b123635cb0902a95d9d6d4584edef43ed19

diff --git a/udevd.c b/udevd.c
index b2cb62f38..5756b4612 100644
--- a/udevd.c
+++ b/udevd.c
@@ -34,9 +34,7 @@
 #include <sys/un.h>
 #include <fcntl.h>
 #include "klibc_fixups.h"
-#ifndef __KLIBC__
 #include <sys/sysinfo.h>
-#endif
 
 #include "list.h"
 #include "udev.h"
@@ -60,6 +58,7 @@ static void exec_queue_manager(void);
 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 +145,7 @@ static void udev_run(struct hotplug_msg *msg)
 	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;
@@ -458,6 +457,13 @@ int main(int argc, char *argv[])
 	/* enable receiving of the sender credentials */
 	setsockopt(ssock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
 
+	/* possible override of udev binary, used for testing */
+	udev_bin = getenv("UDEV_BIN");
+	if (udev_bin != NULL)
+		dbg("udev binary is set to '%s'", udev_bin);
+	else
+		udev_bin = UDEV_BIN;
+
 	FD_ZERO(&readfds);
 	FD_SET(ssock, &readfds);
 	FD_SET(pipefds[0], &readfds);