[systemd-commits] src/udev

[Kay Sievers]

 src/udev/udevd.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 023b9d33e93ea79b6f81daab82cfdca35360e2d0
Author: Kay Sievers <kay at vrfy.org>
Date:   Mon Jul 30 22:34:07 2012 +0200

    udev: set log.c's log level from udev's kernel command line option

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index a028c9c..b78c18f 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1035,14 +1035,17 @@ static void kernel_cmdline_options(struct udev *udev)
                 else
                         opt = s;
 
-                if (startswith(opt, "udev.log-priority="))
-                        udev_set_log_priority(udev, util_log_priority(opt + 18));
+                if (startswith(opt, "udev.log-priority=")) {
+                        int prio;
 
-                if (startswith(opt, "udev.children-max="))
+                        prio = util_log_priority(opt + 18);
+                        log_set_max_level(prio);
+                        udev_set_log_priority(udev, prio);
+                } else if (startswith(opt, "udev.children-max=")) {
                         children_max = strtoul(opt + 18, NULL, 0);
-
-                if (startswith(opt, "udev.exec-delay="))
+                } else if (startswith(opt, "udev.exec-delay=")) {
                         exec_delay = strtoul(opt + 16, NULL, 0);
+                }
 
                 free(s);
         }