X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=4288db9d38177d59ddd28d9ca1def572539bc1a2;hp=b65a28aab69aae78a5189b5726ecaa74468b63b7;hb=6214290df56de85772bdd62f8f646863306b39f0;hpb=be4bedd16b934c8663f8c231f07f23091cde8261

diff --git a/udevstart.c b/udevstart.c
index b65a28aab..4288db9d3 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -2,10 +2,12 @@
  * udevstart.c
  *
  * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
- * 
+ * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+ *
  * Quick and dirty way to populate a /dev with udev if your system
- * does not have access to a shell.  Based originally on a patch to udev 
- * from Harald Hoyer <harald@redhat.com>
+ * does not have access to a shell.  Based originally on a patch
+ * from:
+ *	Harald Hoyer <harald@redhat.com>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -41,10 +43,14 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "udev_rules.h"
 #include "udev_utils.h"
+#include "udev_rules.h"
 #include "list.h"
 
+static const char *udev_run_str;
+static const char *udev_log_str;
+static struct udev_rules rules;
+
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
 {
@@ -111,8 +117,17 @@ static int add_device(const char *path, const char *subsystem)
 	const char *devpath;
 
 	devpath = &path[strlen(sysfs_path)];
+
+	/* 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);
@@ -123,11 +138,11 @@ static int add_device(const char *path, const char *subsystem)
 
 	udev_init_device(&udev, devpath, subsystem, "add");
 	udev.devt = get_devt(class_dev);
-	if (!udev.devt) {
+	if (!udev.devt && udev.type != DEV_NET) {
 		dbg("sysfs_open_class_device_path failed");
 		return -1;
 	}
-	udev_rules_get_name(&udev, class_dev);
+	udev_rules_get_name(&rules, &udev, class_dev);
 	if (udev.ignore_device) {
 		dbg("device event will be ignored");
 		goto exit;
@@ -145,8 +160,12 @@ run:
 		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);
+		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, "add");
+			else
+				execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+		}
 	}
 exit:
 	sysfs_close_class_device(class_dev);
@@ -325,12 +344,16 @@ int main(int argc, char *argv[], char *envp[])
 {
 	struct sigaction act;
 
-	logging_init("udev");
+	logging_init("udevstart");
 	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 (getenv("UDEV_LOG") == NULL)
+	if (udev_log_str == NULL)
 		udev_log_priority = 0;
-	dbg("version %s", UDEV_VERSION);
 
 	/* set signal handlers */
 	memset(&act, 0x00, sizeof(act));
@@ -342,17 +365,14 @@ int main(int argc, char *argv[], char *envp[])
 	sigaction(SIGTERM, &act, NULL);
 
 	/* trigger timeout to prevent hanging processes */
-	alarm(ALARM_TIMEOUT);
-
-	/* set environment for executed programs */
-	setenv("ACTION", "add", 1);
-	setenv("UDEV_START", "1", 1);
+	alarm(UDEV_ALARM_TIMEOUT);
 
-	udev_rules_init();
+	udev_rules_init(&rules, 0, 1);
 
 	udev_scan_block();
 	udev_scan_class();
 
+	udev_rules_close(&rules);
 	logging_close();
 	return 0;
 }