fix default-name handling and NAME="" rules

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index b65a28aab69aae78a5189b5726ecaa74468b63b7..d9912466ca91f5f5aea9258d0237e7543dab317f 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -45,6 +45,10 @@
 #include "udev_utils.h"
 #include "list.h"
 
+static const char *udev_run_str;
+static const char *udev_log_str;
+static struct udev_rules rules;
+
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
 {
@@ -111,8 +115,17 @@ static int add_device(const char *path, const char *subsystem)
        const char *devpath;
 
        devpath = &path[strlen(sysfs_path)];
+
+       /* 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);
@@ -123,11 +136,11 @@ static int add_device(const char *path, const char *subsystem)
 
        udev_init_device(&udev, devpath, subsystem, "add");
        udev.devt = get_devt(class_dev);
-       if (!udev.devt) {
+       if (!udev.devt && udev.type != DEV_NET) {
                dbg("sysfs_open_class_device_path failed");
                return -1;
        }
-       udev_rules_get_name(&udev, class_dev);
+       udev_rules_get_name(&rules, &udev, class_dev);
        if (udev.ignore_device) {
                dbg("device event will be ignored");
                goto exit;
@@ -325,12 +338,16 @@ int main(int argc, char *argv[], char *envp[])
 {
        struct sigaction act;
 
-       logging_init("udev");
+       logging_init("udevstart");
        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));
@@ -342,17 +359,14 @@ int main(int argc, char *argv[], char *envp[])
        sigaction(SIGTERM, &act, NULL);
 
        /* trigger timeout to prevent hanging processes */
-       alarm(ALARM_TIMEOUT);
-
-       /* set environment for executed programs */
-       setenv("ACTION", "add", 1);
-       setenv("UDEV_START", "1", 1);
+       alarm(UDEV_ALARM_TIMEOUT);
 
-       udev_rules_init();
+       udev_rules_init(&rules, 1);
 
        udev_scan_block();
        udev_scan_class();
 
+       udev_rules_close(&rules);
        logging_close();
        return 0;
 }