X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=f2d6f6653c3bc167ffdf3f981798f6d0241e3a84;hb=8d1425d54717b9b9ec06efdd1dd25559445e2571;hp=f0b2800a912b95951c283557b0b66de12dbad1bd;hpb=4937afa402bf142429f0ac6dfc7e1bf8172faa62;p=elogind.git

diff --git a/udev.c b/udev.c
index f0b2800a9..f2d6f6653 100644
--- a/udev.c
+++ b/udev.c
@@ -34,7 +34,6 @@
 #include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
-#include "udev_sysfs.h"
 #include "udev_version.h"
 #include "udev_rules.h"
 #include "logging.h"
@@ -72,6 +71,7 @@ int main(int argc, char *argv[], char *envp[])
 	const char *devpath;
 	const char *subsystem;
 	struct sigaction act;
+	int devnull;
 	int retval = -EINVAL;
 
 	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
@@ -79,7 +79,22 @@ int main(int argc, char *argv[], char *envp[])
 		exit(0);
 	}
 
+	/* set std fd's to /dev/null, if the kernel forks us, we don't have them at all */
+	devnull = open("/dev/null", O_RDWR);
+	if (devnull >= 0)  {
+		if (devnull != STDIN_FILENO)
+			dup2(devnull, STDIN_FILENO);
+		if (devnull != STDOUT_FILENO)
+			dup2(devnull, STDOUT_FILENO);
+		if (devnull != STDERR_FILENO)
+			dup2(devnull, STDERR_FILENO);
+		if (devnull > STDERR_FILENO)
+			close(devnull);
+	}
+
 	logging_init("udev");
+	if (devnull < 0)
+		err("fatal, could not open /dev/null: %s", strerror(errno));
 	udev_init_config();
 	dbg("version %s", UDEV_VERSION);
 
@@ -116,7 +131,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	udev_init_device(&udev, devpath, subsystem, action);
-	udev_rules_init(&rules, 1, 0);
+	udev_rules_init(&rules, 0);
 
 	retval = udev_process_event(&rules, &udev);
 
@@ -125,11 +140,10 @@ int main(int argc, char *argv[], char *envp[])
 
 		dbg("executing run list");
 		list_for_each_entry(name_loop, &udev.run_list, node) {
-			info("RUN key executes '%s'", name_loop->name);
 			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
 				pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, action);
 			else
-				run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_DEBUG));
+				run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
 		}
 	}