From c22569eeeafa94cf510267071f5b75c4ab714e09 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Wed, 22 Feb 2017 04:46:13 +0530 Subject: udev: Introduce UDEV_PROPAGATE_LOG macro (#5302) As per commit 25e773e "udev: switch to systemd logging functions" Now log_set_max_level() in udev_new() overwites system wide log level. Propagate the udev.conf setting to log_set_max_level() only if udev_new() is called from within udevd or one of its helpers. Introduce a UDEV_PROPAGATE_LOG macro that we set with -D on the gcc command line for all udev binaries we build, but not for any others. The log_set_max_level() call is guarded by an ifdef check for that macro, so that it only effects the various udev binaries. closes: #4525 --- src/libudev/libudev.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index d8e13288b0..7c6aeef8dc 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -103,6 +103,8 @@ _public_ struct udev *udev_new(void) { } udev->refcount = 1; +#ifdef UDEV_PROPAGATE_LOG + f = fopen("/etc/udev/udev.conf", "re"); if (f != NULL) { char line[UTIL_LINE_SIZE]; @@ -178,6 +180,7 @@ _public_ struct udev *udev_new(void) { } } } +#endif return udev; } -- cgit v1.2.3-54-g00ecf