"record_failed" -> "fail_event_on_error"

diff --git a/NEWS b/NEWS
index 0f41c18bbe293879a9fe2aa623c1563fcca52197..914b9498fa2a0031f503f944d530b7b625e96807 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ The udevadm trigger "--retry-failed" option, which is replaced since quite
 a while by "--type=failed" is removed.
 
 The failed tracking was not working at all for a few releases. The RUN
 a while by "--type=failed" is removed.
 
 The failed tracking was not working at all for a few releases. The RUN

-option "ignore_error" is replaces by a "record_failed" option, and the
+option "ignore_error" is replaced by a "fail_event_on_error" option, and the

 default is not to track any failing RUN executions.
 
 New keymaps, new modem, hid2hci updated.
 default is not to track any failing RUN executions.
 
 New keymaps, new modem, hid2hci updated.

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 5f6ed06c9c01e11b70088d7589f8385fdfafdf46..03234fe2a1d302b5fa3816ce44954970901ab010 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1379,7 +1379,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                        int flag = 0;
 
                        attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
                        int flag = 0;
 
                        attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);

-                       if (attr != NULL && strstr(attr, "record_failed"))
+                       if (attr != NULL && strstr(attr, "fail_event_on_error"))

                                flag = 1;
                        rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
                        continue;
                                flag = 1;
                        rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
                        continue;

diff --git a/udev/udev.xml b/udev/udev.xml
index 5aa6c38da4f844d2839661349b76a6e3a305dd8c..56fda1070d467deeb8e4d334961fc4adbf949d22 100644 (file)
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -336,9 +336,9 @@
                 event process for a long period of time may block all further events for
                 this or a dependent device. Long running tasks need to be immediately
                 detached from the event process itself. If the option
                 event process for a long period of time may block all further events for
                 this or a dependent device. Long running tasks need to be immediately
                 detached from the event process itself. If the option

-                <option>RUN{<replaceable>record_failed</replaceable>}</option> is specified,
-                and the executed program returns non-zero, the event will be marked as failed
-                for a possible later handling.</para>
+                <option>RUN{<replaceable>fail_event_on_error</replaceable>}</option> is
+                specified, and the executed program returns non-zero, the event will be
+                marked as failed for a possible later handling.</para>

                 <para>If the specified string starts with
                 <option>socket:<replaceable>path</replaceable></option>, all current event
                 values will be passed to the specified socket, as a message in the same
                 <para>If the specified string starts with
                 <option>socket:<replaceable>path</replaceable></option>, all current event
                 values will be passed to the specified socket, as a message in the same