X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=c633fff14b5afb9209f7d3d319befc8cdf9f6064;hb=775f5e35871b665f9cf95698928377c49e3b13fa;hp=f808abf427c61c45abecb4cdafd75c5cf727094c;hpb=f5f0c34f6dc32769fd788560ce0d0cac843872b2;p=elogind.git

diff --git a/udev.c b/udev.c
index f808abf42..c633fff14 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, ...)
@@ -93,6 +94,7 @@ int main(int argc, char *argv[], char *envp[])
 	if (devnull < 0)
 		err("fatal, could not open /dev/null: %s", strerror(errno));
 	udev_config_init();
+	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
 	/* set signal handlers */
@@ -154,7 +156,7 @@ 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");
@@ -165,7 +167,7 @@ int main(int argc, char *argv[], char *envp[])
 				char program[PATH_SIZE];
 
 				strlcpy(program, name_loop->name, sizeof(program));
-				apply_format(udev, program, sizeof(program));
+				udev_rules_apply_format(udev, program, sizeof(program));
 				run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
 			}
 		}
@@ -178,5 +180,7 @@ fail:
 
 exit:
 	logging_close();
-	return retval;
+	if (retval != 0)
+		return 1;
+	return 0;
 }