[PATCH] support DRIVER as a rule key

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 5064bbd17512b0e6463a7fc147469b851cacc39c..a41f22277880be604ab4beef193847373110bbd0 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -35,16 +34,9 @@
 #include "udev_lib.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
-
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
+#include "logging.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -65,15 +57,10 @@ static void asmlinkage sig_handler(int signum)
 {
        switch (signum) {
                case SIGALRM:
-                       gotalarm = 1;
-                       info("error: timeout reached, event probably not handled correctly");
-                       break;
+                       exit(1);
                case SIGINT:
                case SIGTERM:
-                       udevdb_exit();
                        exit(20 + signum);
-               default:
-                       dbg("unhandled signal %d", signum);
        }
 }
 
@@ -91,20 +78,15 @@ int main(int argc, char *argv[], char *envp[])
        } act_type;
 
        dbg("version %s", UDEV_VERSION);
-
-       main_argv = argv;
-       main_envp = envp;
-
        logging_init("udev");
-
        udev_init_config();
 
-       if (strstr(argv[0], "udevstart")) {
+       if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
                act_type = UDEVSTART;
        } else {
-               const char *action = get_action();
-               const char *devpath = get_devpath();
-               const char *subsystem = get_subsystem(main_argv[1]);
+               const char *action = getenv("ACTION");
+               const char *devpath = getenv("DEVPATH");
+               const char *subsystem = argv[1];
 
                if (!action) {
                        dbg("no action?");
@@ -136,7 +118,7 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
 
-               udev_set_values(&udev, devpath, subsystem);
+               udev_set_values(&udev, devpath, subsystem, action);
 
                /* skip blacklisted subsystems */
                if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
@@ -149,6 +131,7 @@ int main(int argc, char *argv[], char *envp[])
        /* set signal handlers */
        act.sa_handler = (void (*) (int))sig_handler;
        sigemptyset (&act.sa_mask);
+       act.sa_flags = 0;
        /* alarm must not restart syscalls*/
        sigaction(SIGALRM, &act, NULL);
        sigaction(SIGINT, &act, NULL);
@@ -157,10 +140,6 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timout to interrupt blocking syscalls */
        alarm(ALARM_TIMEOUT);
 
-       /* initialize udev database */
-       if (udevdb_init(UDEVDB_DEFAULT) != 0)
-               info("error: unable to initialize database, continuing without database");
-
        switch(act_type) {
        case UDEVSTART:
                dbg("udevstart");
@@ -185,8 +164,11 @@ int main(int argc, char *argv[], char *envp[])
                /* name, create node, store in db */
                retval = udev_add_device(&udev, class_dev);
 
-               /* run scripts */
-               dev_d_execute(&udev);
+               /* 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);
+               }
 
                sysfs_close_class_device(class_dev);
                break;
@@ -197,11 +179,9 @@ int main(int argc, char *argv[], char *envp[])
                retval = udev_remove_device(&udev);
 
                /* run scripts */
-               dev_d_execute(&udev);
+               dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
        }
 
-       udevdb_exit();
-
 exit:
        logging_close();
        return retval;