Hello all,

while debugging a curious build failure of umockdev on our ARM
machines [1] I noticed a weird behaviour of udevadm wrt. debug logging
[2].

This patch fixes this (details are in the commit log). Kay, OK to
push?

Thanks,

Martin

[1] https://bugs.debian.org/767909
[2] https://bugs.debian.org/769228
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
>From f860a812b16e0e2f5e77775bf99d59197d25f99f Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.p...@ubuntu.com>
Date: Wed, 12 Nov 2014 10:55:28 +0100
Subject: [PATCH] udevadm: Use correct debug logging function

For debugging which command  gets called in udevadm we want the udev debug
logging, not the systemd one. Otherwise we get rather unexpected udevadm
debugging output (like "calling: info") when booting with "debug" in the kernel
command line, and conversely UDEV_LOG=debug doesn't enable the udevadm
debugging.

https://bugs.debian.org/769228
---
 src/udev/udevadm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index 7026c50..9060abd 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -76,7 +76,7 @@ static int adm_help(struct udev *udev, int argc, char *argv[]) {
 static int run_command(struct udev *udev, const struct udevadm_cmd *cmd, int argc, char *argv[]) {
         if (cmd->debug)
                 log_set_max_level(LOG_DEBUG);
-        log_debug("calling: %s", cmd->name);
+        udev_dbg(udev, "calling: %s", cmd->name);
         return cmd->cmd(udev, argc, argv);
 }
 
-- 
2.1.3

_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Reply via email to