allow RUN to send the environment to a local socket

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index 7564c3de03d5d9e98924bc9abe22e515b0b9cd37..5f3ba711f0303deffaa1a5dc160ecdbd9d114597 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -2,10 +2,12 @@
  * udevstart.c
  *
  * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
- * 
+ * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+ *
  * Quick and dirty way to populate a /dev with udev if your system
- * does not have access to a shell.  Based originally on a patch to udev 
- * from Harald Hoyer <harald@redhat.com>
+ * does not have access to a shell.  Based originally on a patch
+ * from:
+ *     Harald Hoyer <harald@redhat.com>
  *
  *     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
@@ -37,15 +39,29 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_libc_wrapper.h"
+#include "udev_sysfs.h"
 #include "udev.h"
+#include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
 #include "udev_utils.h"
+#include "udev_rules.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 level, const char *format, ...)
+void log_message(int priority, const char *format, ...)
 {
+       va_list args;
+
+       if (priority > udev_log_priority)
+               return;
+
+       va_start(args, format);
+       vsyslog(priority, format, args);
+       va_end(args);
 }
 #endif
 
@@ -102,27 +118,56 @@ 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);
-       udev_add_device(&udev, class_dev);
+       udev_init_device(&udev, devpath, subsystem, "add");
+       udev.devt = get_devt(class_dev);
+       if (!udev.devt && udev.type != DEV_NET) {
+               dbg("sysfs_open_class_device_path failed");
+               return -1;
+       }
+       udev_rules_get_name(&rules, &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;
+       }
 
-       /* run dev.d/ scripts if we created a node or changed a netif name */
-       if (udev_dev_d && udev.devname[0] != '\0') {
+       udev_add_device(&udev, class_dev);
+       if (udev.devname[0] != '\0')
                setenv("DEVNAME", udev.devname, 1);
-               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+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) {
+                       if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
+                               pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, "add");
+                       else
+                               execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+               }
        }
-
+exit:
        sysfs_close_class_device(class_dev);
        udev_cleanup_device(&udev);
 
@@ -299,7 +344,16 @@ int main(int argc, char *argv[], char *envp[])
 {
        struct sigaction act;
 
+       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 (udev_log_str == NULL)
+               udev_log_priority = 0;
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
@@ -311,16 +365,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);
 
-       namedev_init();
+       udev_rules_init(&rules, 1);
 
        udev_scan_block();
        udev_scan_class();
 
+       udev_rules_close(&rules);
+       logging_close();
        return 0;
 }