X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=4e922bb716a734d21e94fd7b5f5f358a40d72c33;hp=7564c3de03d5d9e98924bc9abe22e515b0b9cd37;hb=4d8c16072a2d529b40bcc392396c0dc215236f01;hpb=472419869c387bb0963d8cfecca997b8154f4d44

diff --git a/udevstart.c b/udevstart.c
index 7564c3de0..4e922bb71 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -37,15 +37,28 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_libc_wrapper.h"
+#include "udev_sysfs.h"
 #include "udev.h"
+#include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "udev_utils.h"
 #include "list.h"
 
+static const char *udev_run_str;
+static const char *udev_log_str;
+
 #ifdef USE_LOG
-void log_message(int level, const char *format, ...)
+void log_message(int priority, const char *format, ...)
 {
+	va_list args;
+
+	if (priority > udev_log_priority)
+		return;
+
+	va_start(args, format);
+	vsyslog(priority, format, args);
+	va_end(args);
 }
 #endif
 
@@ -102,27 +115,52 @@ static int add_device(const char *path, const char *subsystem)
 
 	devpath = &path[strlen(sysfs_path)];
 
-	/* set environment for callouts and dev.d/ */
+	/* clear and set environment for next event */
+	clearenv();
+	setenv("ACTION", "add", 1);
 	setenv("DEVPATH", devpath, 1);
 	setenv("SUBSYSTEM", subsystem, 1);
-
+	setenv("UDEV_START", "1", 1);
+	if (udev_log_str)
+		setenv("UDEV_LOG", udev_log_str, 1);
+	if (udev_run_str)
+		setenv("UDEV_RUN", udev_run_str, 1);
 	dbg("exec: '%s' (%s)\n", devpath, path);
 
 	class_dev = sysfs_open_class_device_path(path);
 	if (class_dev == NULL) {
-		dbg ("sysfs_open_class_device_path failed");
-		return -ENODEV;
+		dbg("sysfs_open_class_device_path failed");
+		return -1;
 	}
 
-	udev_init_device(&udev, devpath, subsystem);
-	udev_add_device(&udev, class_dev);
+	udev_init_device(&udev, devpath, subsystem, "add");
+	udev.devt = get_devt(class_dev);
+	if (!udev.devt) {
+		dbg("sysfs_open_class_device_path failed");
+		return -1;
+	}
+	udev_rules_get_name(&udev, class_dev);
+	if (udev.ignore_device) {
+		dbg("device event will be ignored");
+		goto exit;
+	}
+	if (udev.name[0] == '\0') {
+		dbg("device node creation supressed");
+		goto run;
+	}
 
-	/* run dev.d/ scripts if we created a node or changed a netif name */
-	if (udev_dev_d && udev.devname[0] != '\0') {
+	udev_add_device(&udev, class_dev);
+	if (udev.devname[0] != '\0')
 		setenv("DEVNAME", udev.devname, 1);
-		udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-	}
+run:
+	if (udev_run && !list_empty(&udev.run_list)) {
+		struct name_entry *name_loop;
 
+		dbg("executing run list");
+		list_for_each_entry(name_loop, &udev.run_list, node)
+			execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+	}
+exit:
 	sysfs_close_class_device(class_dev);
 	udev_cleanup_device(&udev);
 
@@ -299,7 +337,16 @@ int main(int argc, char *argv[], char *envp[])
 {
 	struct sigaction act;
 
+	logging_init("udev");
 	udev_init_config();
+	dbg("version %s", UDEV_VERSION);
+
+	udev_run_str = getenv("UDEV_RUN");
+	udev_log_str = getenv("UDEV_LOG");
+
+	/* disable all logging if not explicitely requested */
+	if (udev_log_str == NULL)
+		udev_log_priority = 0;
 
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(act));
@@ -313,14 +360,11 @@ int main(int argc, char *argv[], char *envp[])
 	/* trigger timeout to prevent hanging processes */
 	alarm(ALARM_TIMEOUT);
 
-	/* set environment for executed programs */
-	setenv("ACTION", "add", 1);
-	setenv("UDEV_START", "1", 1);
-
-	namedev_init();
+	udev_rules_init();
 
 	udev_scan_block();
 	udev_scan_class();
 
+	logging_close();
 	return 0;
 }