[PATCH] let udev act as udevstart if argv[1] == "udevstart"

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index cac60fd932bfcff1e3b72d2db1e6431fd73fba0e..b54896669b72baddf579a6af0897592a1431af50 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -38,8 +38,6 @@
 #include "namedev.h"
 #include "udevdb.h"
 
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
 
 /* global variables */
 char **main_argv;
@@ -64,15 +62,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);
        }
 }
 
@@ -98,7 +91,7 @@ int main(int argc, char *argv[], char *envp[])
 
        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();
@@ -148,6 +141,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);
@@ -156,10 +150,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");
@@ -199,8 +189,6 @@ int main(int argc, char *argv[], char *envp[])
                dev_d_execute(&udev);
        }
 
-       udevdb_exit();
-
 exit:
        logging_close();
        return retval;