[PATCH] Keep udevstart from skipping devices without a 'dev' file

[elogind.git] / udevinitsend.c

diff --git a/udevinitsend.c b/udevinitsend.c
index c7d56fc25979cf3dcbd8aa578d7605173145b931..26ae5c84185b5a18c74793909427d5229961a624 100644 (file)
--- a/udevinitsend.c
+++ b/udevinitsend.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -38,16 +39,21 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "udevd.h"
+#include "udev_utils.h"
 #include "logging.h"
 
+static int log = 0;
 
 #ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+void log_message (int priority, const char *format, ...)
 {
        va_list args;
 
+       if (priority > log)
+               return;
+
        va_start(args, format);
-       vsyslog(level, format, args);
+       vsyslog(priority, format, args);
        va_end(args);
 }
 #endif
@@ -94,7 +100,7 @@ static int udevsend(char *filename, int sock, int disable_loop_detection)
 
        memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
        strcpy(usend_msg.magic, UDEV_MAGIC);
-       usend_msg.type = UDEVD_INITSEND;
+       usend_msg.type = UDEVD_UEVENT_INITSEND;
 
        ls = fdmap;
        ch = le = ls;
@@ -164,6 +170,11 @@ int main(int argc, char *argv[], char *envp[])
        int retval = 1;
        int disable_loop_detection = 0;
        int sock;
+       const char *env;
+
+       env = getenv("UDEV_LOG");
+       if (env)
+               log = log_priority(env);
 
        logging_init("udevinitsend");
        dbg("version %s", UDEV_VERSION);