chiark / gitweb /
volume_id: use udev-provided log-level
authorKay Sievers <kay.sievers@suse.de>
Sun, 5 Jun 2005 03:17:21 +0000 (05:17 +0200)
committerKay Sievers <kay.sievers@suse.de>
Sun, 5 Jun 2005 03:17:21 +0000 (05:17 +0200)
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
extras/volume_id/Makefile
extras/volume_id/udev_volume_id.c
udev.c

index 91527cc..56fdf27 100644 (file)
@@ -33,7 +33,7 @@ override CFLAGS+=-D_FILE_OFFSET_BITS=64
 VOLUME_ID_BASE=volume_id
 include $(VOLUME_ID_BASE)/Makefile.inc
 
-OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) $(SYSFS)
+OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) ../../udev.a
 HEADERS = $(VOLUME_ID_HEADERS)
 
 $(OBJS): $(HEADERS)
index a00b01a..7c6fc40 100644 (file)
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
 #ifdef USE_LOG
-void log_message(int level, const char *format, ...)
+void log_message(int priority, const char *format, ...)
 {
        va_list args;
+       static int udev_log = -1;
+
+       if (udev_log == -1) {
+               const char *value;
+
+               value = getenv("UDEV_LOG");
+               if (value)
+                       udev_log = log_priority(value);
+               else
+                       udev_log = LOG_ERR;
+       }
+
+       if (priority > udev_log)
+               return;
 
        va_start(args, format);
-       vsyslog(level, format, args);
+       vsyslog(priority, format, args);
        va_end(args);
 }
 #endif
diff --git a/udev.c b/udev.c
index 999d25d..3f76e98 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -152,7 +152,7 @@ int main(int argc, char *argv[], char *envp[])
                goto hotplug;
        }
 
-       /* export logging flag, as called scripts may want to do the same as udev */
+       /* export logging flag, as called programs may want to do the same as udev */
        if (udev_log_priority) {
                char priority[32];