X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=6b454f3157a3d46fff83916af8e22bdcdab2df83;hp=4762ab1cef022cf0a0d68221803f2bbd10da81ce;hb=49e7f5a05f7fc2a223aa9592530a6dbdc0ebfd4a;hpb=1aa1e24848903d11780db1ade355be73ad61a937

diff --git a/udev.c b/udev.c
index 4762ab1ce..6b454f315 100644
--- a/udev.c
+++ b/udev.c
@@ -32,6 +32,7 @@
 
 #include "udev.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
@@ -76,7 +77,7 @@ 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 */
+	/* set std fd's to /dev/null, /sbin/hotplug forks us, we don't have them at all */
 	devnull = open("/dev/null", O_RDWR);
 	if (devnull >= 0)  {
 		if (devnull != STDIN_FILENO)
@@ -91,8 +92,9 @@ int main(int argc, char *argv[], char *envp[])
 
 	logging_init("udev");
 	if (devnull < 0)
-		err("fatal, could not open /dev/null: %s", strerror(errno));
+		err("open /dev/null failed: %s", strerror(errno));
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	/* set signal handlers */
@@ -154,15 +156,20 @@ int main(int argc, char *argv[], char *envp[])
 
 	retval = udev_device_event(&rules, udev);
 
-	if (!retval && udev_run && !list_empty(&udev->run_list)) {
+	if (retval == 0 && !udev->ignore_device && udev_run) {
 		struct name_entry *name_loop;
 
 		dbg("executing run list");
 		list_for_each_entry(name_loop, &udev->run_list, node) {
 			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->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+			else {
+				char program[PATH_SIZE];
+
+				strlcpy(program, name_loop->name, sizeof(program));
+				udev_rules_apply_format(udev, program, sizeof(program));
+				run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+			}
 		}
 	}
 
@@ -173,5 +180,7 @@ fail:
 
 exit:
 	logging_close();
-	return retval;
+	if (retval != 0)
+		return 1;
+	return 0;
 }