X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=c26ce46b64ded246f87a5cca5f329a9a6421989f;hb=9bad6028f738e78b69d18947d586dce7b9267785;hp=8e6d06f1bd0071a3414db5dac712a7d8b218f951;hpb=c449b25e3f998efe8f5988632126fb468ee55fc5;p=elogind.git

diff --git a/udev.c b/udev.c
index 8e6d06f1b..c26ce46b6 100644
--- a/udev.c
+++ b/udev.c
@@ -33,7 +33,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
 #include "namedev.h"
@@ -41,7 +41,6 @@
 
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
 {
 	va_list args;
@@ -55,6 +54,35 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
+/* decide if we should manage the whole hotplug event
+ * for now look if the kernel calls udevsend instead of /sbin/hotplug
+ */
+static int manage_hotplug_event(void) {
+	char helper[256];
+	int fd;
+	int len;
+
+	/* don't handle hotplug.d if we are called directly */
+	if (!getenv("UDEVD_EVENT"))
+		return 0;
+
+	fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
+	if (fd < 0)
+		return 0;
+
+	len = read(fd, helper, 256);
+	close(fd);
+
+	if (len < 0)
+		return 0;
+	helper[len] = '\0';
+
+	if (strstr(helper, "udevsend"))
+		return 1;
+
+	return 0;
+}
+
 static void asmlinkage sig_handler(int signum)
 {
 	switch (signum) {
@@ -68,36 +96,41 @@ static void asmlinkage sig_handler(int signum)
 
 int main(int argc, char *argv[], char *envp[])
 {
-	struct sigaction act;
 	struct sysfs_class_device *class_dev;
 	struct sysfs_device *devices_dev;
 	struct udevice udev;
 	char path[SYSFS_PATH_MAX];
-	int retval = -EINVAL;
 	const char *error;
-	const char *action = getenv("ACTION");
-	const char *devpath = getenv("DEVPATH");
-	const char *subsystem = argv[1];
+	const char *action;
+	const char *devpath;
+	const char *subsystem;
+	int managed_event;
+	struct sigaction act;
+	int retval = -EINVAL;
+
+	if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+		printf("%s\n", UDEV_VERSION);
+		exit(0);
+	}
 
-	dbg("version %s", UDEV_VERSION);
 	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);
-
-	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 */
@@ -108,74 +141,78 @@ int main(int argc, char *argv[], char *envp[])
 		goto exit;
 	}
 
-	if (!action) {
-		dbg("no action");
-		goto exit;
-	}
+	/* let the executed programs know if we handle the whole hotplug event */
+	managed_event = manage_hotplug_event();
+	if (managed_event)
+		setenv("MANAGED_EVENT", "1", 1);
 
-	if (!subsystem) {
-		dbg("no subsystem");
-		goto exit;
-	}
+	action = getenv("ACTION");
+	devpath = getenv("DEVPATH");
+	subsystem = getenv("SUBSYSTEM");
+	/* older kernels passed the SUBSYSTEM only as argument */
+	if (!subsystem && argc == 2)
+		subsystem = argv[1];
 
-	if (!devpath) {
-		dbg("no devpath");
-		goto exit;
+	udev_init_device(&udev, devpath, subsystem);
+
+	if (!action || !subsystem || !devpath) {
+		dbg("action, subsystem or devpath missing");
+		goto hotplug;
 	}
 
-	/* export logging flag, called scripts may want to do the same as udev */
+	/* export logging flag, as called scripts may want to do the same as udev */
 	if (udev_log)
 		setenv("UDEV_LOG", "1", 1);
 
-	if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+	if (udev.type == BLOCK || udev.type == CLASS || udev.type == NET) {
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs and possibly add node */
 			dbg("udev add");
 
-			/* skip blacklisted subsystems */
-			if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+			/* skip subsystems without "dev", but handle net devices */
+			if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
 				dbg("don't care about '%s' devices", udev.subsystem);
-				goto exit;
-			};
+				goto hotplug;
+			}
 
 			snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
 			class_dev = wait_class_device_open(path);
 			if (class_dev == NULL) {
 				dbg ("open class device failed");
-				goto exit;
+				goto hotplug;
 			}
 			dbg("opened class_dev->name='%s'", class_dev->name);
 
 			wait_for_class_device(class_dev, &error);
 
-			/* init rules, permissions */
+			/* init rules */
 			namedev_init();
 
 			/* 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);
-				dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
-			}
-
 			sysfs_close_class_device(class_dev);
 		} else if (strcmp(action, "remove") == 0) {
 			/* possibly remove a node */
 			dbg("udev remove");
 
-			/* get node from db, delete it */
-			retval = udev_remove_device(&udev);
-
-			/* run dev.d/ scripts if we're not instructed to ignore the event */
-			if (udev.devname[0] != '\0') {
-				setenv("DEVNAME", udev.devname, 1);
-				dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+			/* 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);
+		}
+
+		/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
+		if (udev.devname[0] != '\0') {
+			setenv("DEVNAME", udev.devname, 1);
+			if (udev_dev_d)
+				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
 		}
-	} else if ((strncmp(devpath, "/devices/", 9) == 0)) {
+	} else if (udev.type == PHYSDEV) {
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs */
 			dbg("devices add");
@@ -184,7 +221,7 @@ int main(int argc, char *argv[], char *envp[])
 			devices_dev = wait_devices_device_open(path);
 			if (!devices_dev) {
 				dbg("devices device unavailable (probably remove has beaten us)");
-				goto exit;
+				goto hotplug;
 			}
 			dbg("devices device opened '%s'", path);
 
@@ -198,6 +235,11 @@ int main(int argc, char *argv[], char *envp[])
 		dbg("unhandled");
 	}
 
+hotplug:
+	udev_cleanup_device(&udev);
+	if (udev_hotplug_d && managed_event)
+		udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
+
 exit:
 	logging_close();
 	return retval;