[systemd-devel] [PATCH] udevd: add --event-timeout commandline option

[Hannes Reinecke]

On 07/29/2014 04:13 PM, Kay Sievers wrote:
> On Tue, Jul 29, 2014 at 9:06 AM, Hannes Reinecke <hare at suse.de> wrote:
>> On large configurations some events take longer than the
>> default 30 seconds. Killing those events will leave the
>> machine halfway configured.
>>
>> So add a commandline option '--event-timeout' to handle these cases.
>
> Applied. But with a follow-up commit, I changed the timeout logic. We
> do not need or want several independent timeouts for the same thing.
> Please check.
>
Hmm. You sure this is correct?


@@ -1462,14 +1454,6 @@ static int add_rule(struct udev_rules *rules, 
char *line,
                                  rule_add_key(&rule_tmp, 
TK_A_DEVLINK_PRIO, op, NULL, &prio);
                          }

-                        pos = strstr(value, "event_timeout=");
-                        if (pos != NULL) {
-                                int tout = 
atoi(&pos[strlen("event_timeout=")]);
-
-                                rule_add_key(&rule_tmp, 
TK_M_EVENT_TIMEOUT, op, NULL, &tout);
-                        }
-
-                        pos = strstr(value, "string_escape=");
                          if (pos != NULL) {
                                  pos = &pos[strlen("string_escape=")];
                                  if (startswith(pos, "none"))

Looks like the line 'pos = strstr(value, "string_escape=");' should 
have been deleted ...

Cheers,

Hannes
-- 
Dr. Hannes Reinecke		      zSeries & Storage
hare at suse.de			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)