store the imported device information in the udevdb

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index 34f3835d65f3e0026805489736240b1afb3c6769..4e922bb716a734d21e94fd7b5f5f358a40d72c33 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -37,6 +37,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_libc_wrapper.h"
+#include "udev_sysfs.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
@@ -44,6 +45,9 @@
 #include "udev_utils.h"
 #include "list.h"
 
+static const char *udev_run_str;
+static const char *udev_log_str;
+
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
 {
@@ -111,32 +115,52 @@ static int add_device(const char *path, const char *subsystem)
 
        devpath = &path[strlen(sysfs_path)];
 
-       /* set environment for callouts and dev.d/ */
+       /* 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);
        if (class_dev == NULL) {
-               dbg ("sysfs_open_class_device_path failed");
-               return -ENODEV;
+               dbg("sysfs_open_class_device_path failed");
+               return -1;
        }
 
        udev_init_device(&udev, devpath, subsystem, "add");
-       udev_add_device(&udev, class_dev);
+       udev.devt = get_devt(class_dev);
+       if (!udev.devt) {
+               dbg("sysfs_open_class_device_path failed");
+               return -1;
+       }
+       udev_rules_get_name(&udev, class_dev);
+       if (udev.ignore_device) {
+               dbg("device event will be ignored");
+               goto exit;
+       }
+       if (udev.name[0] == '\0') {
+               dbg("device node creation supressed");
+               goto run;
+       }
 
+       udev_add_device(&udev, class_dev);
        if (udev.devname[0] != '\0')
                setenv("DEVNAME", udev.devname, 1);
-
+run:
        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);
+                       execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
        }
-
+exit:
        sysfs_close_class_device(class_dev);
        udev_cleanup_device(&udev);
 
@@ -315,10 +339,14 @@ int main(int argc, char *argv[], char *envp[])
 
        logging_init("udev");
        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));
@@ -332,10 +360,6 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       /* set environment for executed programs */
-       setenv("ACTION", "add", 1);
-       setenv("UDEV_START", "1", 1);
-
        udev_rules_init();
 
        udev_scan_block();