[systemd-commits] 2 commits - src/udev

[Tom Gundersen]

 src/udev/udev-rules.c |    2 +-
 src/udev/udevd.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b5338a19864ac3f5632aee48069a669479621dca
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Sep 10 10:56:26 2014 +0200

    udev: timeout - increase timeout
    
    Some kernel modules still take more than one minute to insmod, we no longer rely on the timeout
    killing insmod within a given period of time, so just bump this to a much higher value. Its only
    purpose is to make sure that nothing stays aronud forever.

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index b023b6e..a7f8cbd 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -74,7 +74,7 @@ static bool reload;
 static int children;
 static int children_max;
 static int exec_delay;
-static usec_t event_timeout_usec = 60 * USEC_PER_SEC;
+static usec_t event_timeout_usec = 180 * USEC_PER_SEC;
 static sigset_t sigmask_orig;
 static UDEV_LIST(event_list);
 static UDEV_LIST(worker_list);

commit ec3281d3b681b002dfe1a4bea0532a504e37557a
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Sep 10 07:59:22 2014 +0200

    udev: fix copy-paste error in log message

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index cc56215..6de7511 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1323,7 +1323,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                                 if (cmd < UDEV_BUILTIN_MAX)
                                         rule_add_key(&rule_tmp, TK_A_RUN_BUILTIN, op, value, &cmd);
                                 else
-                                        log_error("IMPORT{builtin}: '%s' unknown %s:%u", value, filename, lineno);
+                                        log_error("RUN{builtin}: '%s' unknown %s:%u", value, filename, lineno);
                         } else if (streq(attr, "program")) {
                                 enum udev_builtin_cmd cmd = UDEV_BUILTIN_MAX;