chiark / gitweb /
[PATCH] add RUN key to be able to run rule based notification
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 122d34c1a5397b7e85ae20ea3c027eaefac3725d..5728be59e0d435c8107cfa803957cc971854ead8 100644 (file)
--- a/udev.c
+++ b/udev.c
 #include <unistd.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "logging.h"
 
-
-#ifdef LOG
-void log_message(int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
        va_list args;
 
-       if (!udev_log)
+       if (priority > udev_log_priority)
                return;
 
        va_start(args, format);
-       vsyslog(level, format, args);
+       vsyslog(priority, format, args);
        va_end(args);
 }
 #endif
@@ -96,16 +96,16 @@ 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];
+       char path[PATH_SIZE];
        const char *error;
        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) {
@@ -114,13 +114,12 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        logging_init("udev");
-       dbg("version %s", UDEV_VERSION);
-
        udev_init_config();
+       dbg("version %s", UDEV_VERSION);
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
-       act.sa_handler = (void (*) (int))sig_handler;
+       act.sa_handler = (void (*)(int)) sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
@@ -130,17 +129,6 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       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 */
-               udev_log = 0;
-
-               namedev_init();
-               retval = udev_start();
-               goto exit;
-       }
-
        /* let the executed programs know if we handle the whole hotplug event */
        managed_event = manage_hotplug_event();
        if (managed_event)
@@ -152,51 +140,46 @@ int main(int argc, char *argv[], char *envp[])
        /* older kernels passed the SUBSYSTEM only as argument */
        if (!subsystem && argc == 2)
                subsystem = argv[1];
-       udev_init_device(&udev, devpath, subsystem);
 
-       if (!action) {
-               dbg("no action");
-               goto hotplug;
-       }
+       udev_init_device(&udev, devpath, subsystem, action);
 
-       if (!subsystem) {
-               dbg("no subsystem");
+       if (!action || !subsystem || !devpath) {
+               err("action, subsystem or devpath missing");
                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_priority) {
+               char priority[32];
+
+               sprintf(priority, "%i", udev_log_priority);
+               setenv("UDEV_LOG", priority, 1);
        }
 
-       /* export logging flag, as called scripts may want to do the same as udev */
-       if (udev_log)
-               setenv("UDEV_LOG", "1", 1);
+       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
+               udev_rules_init();
 
-       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 subsystems without "dev", but handle net devices */
-                       if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+                       if (udev.type != DEV_NET && 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);
+                       snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+                       path[sizeof(path)-1] = '\0';
                        class_dev = wait_class_device_open(path);
                        if (class_dev == NULL) {
-                               dbg ("open class device failed");
+                               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 */
-                       namedev_init();
-
                        /* name, create node, store in db */
                        retval = udev_add_device(&udev, class_dev);
 
@@ -211,22 +194,37 @@ int main(int argc, char *argv[], char *envp[])
                                goto hotplug;
                        }
 
+                       udev_rules_get_run(&udev);
+                       if (udev.ignore_device) {
+                               dbg("device event will be ignored");
+                               goto hotplug;
+                       }
+
                        /* get node from db, remove db-entry, delete created node */
                        retval = udev_remove_device(&udev);
                }
 
+               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_command(name_loop->name, udev.subsystem);
+               }
+
                /* 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 == DEV_DEVICE) {
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs */
                        dbg("devices add");
 
-                       snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
+                       snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
+                       path[sizeof(path)-1] = '\0';
                        devices_dev = wait_devices_device_open(path);
                        if (!devices_dev) {
                                dbg("devices device unavailable (probably remove has beaten us)");
@@ -248,7 +246,8 @@ hotplug:
        if (udev_hotplug_d && managed_event)
                udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
-exit:
+       udev_cleanup_device(&udev);
+
        logging_close();
        return retval;
 }