shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

volume_id: use udev-provided log-level

Browse Source 
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
Kay Sievers 2005-06-05 05:17:21 +02:00
parent 995aec8759
commit c2401132bf
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/volume_id/Makefile
View File

@ -33,7 +33,7 @@ override CFLAGS+=-D_FILE_OFFSET_BITS=64
VOLUME_ID_BASE=volume_id VOLUME_ID_BASE=volume_id
include $(VOLUME_ID_BASE)/Makefile.inc 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) HEADERS = $(VOLUME_ID_HEADERS)
$(OBJS): $(HEADERS) $(OBJS): $(HEADERS)

18
extras/volume_id/udev_volume_id.c
View File

@ -40,12 +40,26 @@
#define BLKGETSIZE64 _IOR(0x12,114,size_t) #define BLKGETSIZE64 _IOR(0x12,114,size_t)
#ifdef USE_LOG #ifdef USE_LOG
void log_message(int level, const char *format, ...) void log_message(int priority, const char *format, ...)
{ {
va_list args; 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); va_start(args, format);
vsyslog(level, format, args); vsyslog(priority, format, args);
va_end(args); va_end(args);
} }
#endif #endif

2
udev.c
View File

@ -152,7 +152,7 @@ int main(int argc, char *argv[], char *envp[])
goto hotplug; 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) { if (udev_log_priority) {
char priority[32]; char priority[32];