X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=b1ba1435e7236926e905e7f20959058954b906fe;hb=51737eb8b8087d3d9c0cbad8caeaed9efde907fe;hp=9b0a00fb78c7c53d642fc17ed88ea345c782c0c8;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;p=elogind.git

diff --git a/udev.c b/udev.c
index 9b0a00fb7..b1ba1435e 100644
--- a/udev.c
+++ b/udev.c
@@ -61,6 +61,10 @@ static int manage_hotplug_event(void) {
 	int fd;
 	int len;
 
+	/* false, if we are called directly */
+	if (!getenv("MANAGED_EVENT"))
+		goto exit;
+
 	fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
 	if (fd < 0)
 		goto exit;
@@ -103,26 +107,36 @@ int main(int argc, char *argv[], char *envp[])
 	const char *devpath = getenv("DEVPATH");
 	const char *subsystem = argv[1];
 
-	dbg("version %s", UDEV_VERSION);
+	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		printf("%s\n", UDEV_VERSION);
+		exit(0);
+	}
+
 	logging_init("udev");
+	dbg("version %s", UDEV_VERSION);
+
 	udev_init_config();
 
 	/* set signal handlers */
-	memset(&act, 0x00, sizeof(act));
 	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
-	/* alarm must not restart syscalls*/
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
 	sigaction(SIGTERM, &act, NULL);
 
-	/* trigger timeout to interrupt blocking syscalls */
+	/* trigger timeout to prevent hanging processes */
 	alarm(ALARM_TIMEOUT);
 
-	udev_set_values(&udev, devpath, subsystem, action);
+	action = getenv("ACTION");
+	devpath = getenv("DEVPATH");
+	subsystem = getenv("SUBSYSTEM");
+	/* older kernels passed the SUBSYSTEM only as argument */
+	if (!subsystem && argc == 2)
+		subsystem = argv[1];
+	udev_init_device(&udev, devpath, subsystem);
 
-	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
+	if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
 		dbg("udevstart");
 
 		/* disable all logging, as it's much too slow on some facilities */
@@ -157,11 +171,11 @@ int main(int argc, char *argv[], char *envp[])
 			/* wait for sysfs and possibly add node */
 			dbg("udev add");
 
-			/* skip blacklisted subsystems */
+			/* skip subsystems without "dev", but handle net devices */
 			if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
 				dbg("don't care about '%s' devices", udev.subsystem);
 				goto hotplug;
-			};
+			}
 
 			snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
 			class_dev = wait_class_device_open(path);
@@ -179,30 +193,25 @@ int main(int argc, char *argv[], char *envp[])
 			/* name, create node, store in db */
 			retval = udev_add_device(&udev, class_dev);
 
-			/* run dev.d/ scripts if we created a node or changed a netif name */
-			if (udev.devname[0] != '\0') {
-				setenv("DEVNAME", udev.devname, 1);
-				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-			}
-
 			sysfs_close_class_device(class_dev);
 		} else if (strcmp(action, "remove") == 0) {
 			/* possibly remove a node */
 			dbg("udev remove");
 
+			/* skip subsystems without "dev" */
+			if (subsystem_expect_no_dev(udev.subsystem)) {
+				dbg("don't care about '%s' devices", udev.subsystem);
+				goto hotplug;
+			}
+
 			/* get node from db, remove db-entry, delete created node */
 			retval = udev_remove_device(&udev);
+		}
 
-			/* Set the DEVNAME if known */
-			if (udev.devname[0] != '\0') {
-				setenv("DEVNAME", udev.devname, 1);
-			}
-			/* run dev.d/ scripts if we're not instructed to ignore the event */
-			if (udev.devname[0] != '\0') {
-				setenv("DEVNAME", udev.devname, 1);
-				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-			}
-
+		/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
+		if (udev_dev_d && udev.devname[0] != '\0') {
+			setenv("DEVNAME", udev.devname, 1);
+			udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
 		}
 	} else if ((strncmp(devpath, "/devices/", 9) == 0)) {
 		if (strcmp(action, "add") == 0) {
@@ -228,7 +237,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 hotplug:
-	if (manage_hotplug_event())
+	if (udev_hotplug_d && manage_hotplug_event())
 		udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
 exit: