[PATCH] split udev and udevstart

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index c26ce46b64ded246f87a5cca5f329a9a6421989f..c9461469e54273561da1ba0cc1f9fc740c735974 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -40,7 +40,7 @@
 #include "logging.h"
 
 
-#ifdef LOG
+#ifdef USE_LOG
 void log_message(int level, const char *format, ...)
 {
        va_list args;
@@ -130,17 +130,6 @@ int main(int argc, char *argv[], char *envp[])
        /* trigger timeout to prevent hanging processes */
        alarm(ALARM_TIMEOUT);
 
-       if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
-               dbg("udevstart");
-
-               /* disable all logging, as it's much too slow on some facilities */
-               udev_log = 0;
-
-               namedev_init();
-               retval = udev_start();
-               goto exit;
-       }
-
        /* let the executed programs know if we handle the whole hotplug event */
        managed_event = manage_hotplug_event();
        if (managed_event)
@@ -240,7 +229,6 @@ hotplug:
        if (udev_hotplug_d && managed_event)
                udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
-exit:
        logging_close();
        return retval;
 }