chiark / gitweb /
[PATCH] don't call dev.d/ scripts twice, if directory = subsystem
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index a41f222..5ad7e42 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     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
@@ -24,6 +25,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+#include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
@@ -31,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"
@@ -53,6 +55,30 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
+/* (for now) true if udevsend is the helper */
+static int manage_hotplug_event(void) {
+       char helper[256];
+       int fd;
+       int len;
+
+       fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
+       if (fd < 0)
+               goto exit;
+
+       len = read(fd, helper, 256);
+       close(fd);
+
+       if (len < 0)
+               goto exit;
+       helper[len] = '\0';
+
+       if (strstr(helper, "udevsend"))
+               return 1;
+
+exit:
+       return 0;
+}
+
 static void asmlinkage sig_handler(int signum)
 {
        switch (signum) {
@@ -68,67 +94,21 @@ 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;
-       enum {
-               ADD,
-               REMOVE,
-               UDEVSTART,
-       } act_type;
+       const char *error;
+       const char *action = getenv("ACTION");
+       const char *devpath = getenv("DEVPATH");
+       const char *subsystem = argv[1];
 
        dbg("version %s", UDEV_VERSION);
        logging_init("udev");
        udev_init_config();
 
-       if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
-               act_type = UDEVSTART;
-       } else {
-               const char *action = getenv("ACTION");
-               const char *devpath = getenv("DEVPATH");
-               const char *subsystem = argv[1];
-
-               if (!action) {
-                       dbg("no action?");
-                       goto exit;
-               }
-               if (strcmp(action, "add") == 0) {
-                       act_type = ADD;
-               } else if (strcmp(action, "remove") == 0) {
-                       act_type = REMOVE;
-               } else {
-                       dbg("no action '%s' for us", action);
-                       goto exit;
-               }
-
-               if (!devpath) {
-                       dbg("no devpath?");
-                       goto exit;
-               }
-               dbg("looking at '%s'", devpath);
-
-               /* we only care about class devices and block stuff */
-               if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
-                       dbg("not a block or class device");
-                       goto exit;
-               }
-
-               if (!subsystem) {
-                       dbg("no subsystem");
-                       goto exit;
-               }
-
-               udev_set_values(&udev, devpath, subsystem, action);
-
-               /* skip blacklisted subsystems */
-               if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
-                       dbg("don't care about '%s' devices", subsystem);
-                       goto exit;
-               };
-
-       }
-
        /* set signal handlers */
+       memset(&act, 0x00, sizeof(act));
        act.sa_handler = (void (*) (int))sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
@@ -137,51 +117,120 @@ int main(int argc, char *argv[], char *envp[])
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       /* trigger timout to interrupt blocking syscalls */
+       /* trigger timeout to interrupt blocking syscalls */
        alarm(ALARM_TIMEOUT);
 
-       switch(act_type) {
-       case UDEVSTART:
+       udev_set_values(&udev, devpath, subsystem, action);
+
+       if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
                dbg("udevstart");
+
+               /* disable all logging, as it's much too slow on some facilities */
+               udev_log = 0;
+
                namedev_init();
                retval = udev_start();
-               break;
-       case ADD:
-               dbg("udev add");
-
-               /* open the device */
-               snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
-               class_dev = sysfs_open_class_device_path(path);
-               if (class_dev == NULL) {
-                       dbg ("sysfs_open_class_device_path failed");
-                       break;
-               }
-               dbg("opened class_dev->name='%s'", class_dev->name);
+               goto exit;
+       }
 
-               /* init rules */
-               namedev_init();
+       if (!action) {
+               dbg("no action");
+               goto hotplug;
+       }
 
-               /* name, create node, store in db */
-               retval = udev_add_device(&udev, class_dev);
+       if (!subsystem) {
+               dbg("no subsystem");
+               goto hotplug;
+       }
+
+       if (!devpath) {
+               dbg("no devpath");
+               goto hotplug;
+       }
+
+       /* 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 (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)) {
+                               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);
+                       if (class_dev == NULL) {
+                               dbg ("open class device failed");
+                               goto hotplug;
+                       }
+                       dbg("opened class_dev->name='%s'", class_dev->name);
+
+                       wait_for_class_device(class_dev, &error);
+
+                       /* init rules, permissions */
+                       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_dev_d && 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");
+
+                       /* 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_dev_d && udev.devname[0] != '\0') {
+                               setenv("DEVNAME", udev.devname, 1);
+                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+                       }
 
-               /* 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);
                }
+       } else if ((strncmp(devpath, "/devices/", 9) == 0)) {
+               if (strcmp(action, "add") == 0) {
+                       /* wait for sysfs */
+                       dbg("devices add");
 
-               sysfs_close_class_device(class_dev);
-               break;
-       case REMOVE:
-               dbg("udev remove");
+                       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
+                       devices_dev = wait_devices_device_open(path);
+                       if (!devices_dev) {
+                               dbg("devices device unavailable (probably remove has beaten us)");
+                               goto hotplug;
+                       }
+                       dbg("devices device opened '%s'", path);
 
-               /* get node from db, delete it*/
-               retval = udev_remove_device(&udev);
+                       wait_for_devices_device(devices_dev, &error);
 
-               /* run scripts */
-               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+                       sysfs_close_device(devices_dev);
+               } else if (strcmp(action, "remove") == 0) {
+                       dbg("devices remove");
+               }
+       } else {
+               dbg("unhandled");
        }
 
+hotplug:
+       if (manage_hotplug_event())
+               udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
+
 exit:
        logging_close();
        return retval;