X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=c633fff14b5afb9209f7d3d319befc8cdf9f6064;hb=38895e573c6f17014393dc35a9e53d5f016172c3;hp=6387d0b14e89a0423fac682108cff609867b036b;hpb=a9bd2ed84a7b0871c281adc8226f12ae46da4de0;p=elogind.git

diff --git a/udev.c b/udev.c
index 6387d0b14..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");
@@ -178,5 +180,7 @@ fail:
 
 exit:
 	logging_close();
-	return retval;
+	if (retval != 0)
+		return 1;
+	return 0;
 }