morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

udev-rules: introduce OPTIONS="dump" token

Browse Source 
Should be useful for debugging.
This commit is contained in:
Yu Watanabe
2025-01-11 17:00:17 +09:00
parent 91d9f8f834
commit b4ffb77669
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
man/udev.xml
View File

@@ -720,6 +720,15 @@ SUBSYSTEM=="net", OPTIONS="log_level=debug"</programlisting></para>
<xi:include href="version-info.xml" xpointer="v248"/>
</listitem>
</varlistentry>
<varlistentry>
<term><option>dump</option></term>
<listitem>
<para>Dump the status of the event currently processing. It may be useful for debugging
udev rules by inserting this option.</para>
<xi:include href="version-info.xml" xpointer="v258"/>
</listitem>
</varlistentry>
</variablelist>
</listitem>
</varlistentry>

33
src/udev/udev-rules.c
View File

@@ -18,6 +18,7 @@
#include "fs-util.h"
#include "glob-util.h"
#include "list.h"
#include "memstream-util.h"
#include "mkdir.h"
#include "netif-naming-scheme.h"
#include "nulstr-util.h"
@@ -32,6 +33,7 @@
#include "sysctl-util.h"
#include "syslog-util.h"
#include "udev-builtin.h"
#include "udev-dump.h"
#include "udev-event.h"
#include "udev-format.h"
#include "udev-node.h"
@@ -117,6 +119,7 @@ typedef enum {
#define _TK_A_MIN _TK_M_MAX
/* lvalues which take one of assign operators */
TK_A_OPTIONS_DUMP, /* no argument */
TK_A_OPTIONS_STRING_ESCAPE_NONE, /* no argument */
TK_A_OPTIONS_STRING_ESCAPE_REPLACE, /* no argument */
TK_A_OPTIONS_DB_PERSIST, /* no argument */
@@ -991,7 +994,9 @@ static int parse_token(
if (op == OP_ADD)
op = OP_ASSIGN;
if (streq(value, "string_escape=none"))
if (streq(value, "dump"))
r = rule_line_add_token(rule_line, TK_A_OPTIONS_DUMP, op, NULL, NULL, /* is_case_insensitive = */ false, token_str);
else if (streq(value, "string_escape=none"))
r = rule_line_add_token(rule_line, TK_A_OPTIONS_STRING_ESCAPE_NONE, op, NULL, NULL, /* is_case_insensitive = */ false, token_str);
else if (streq(value, "string_escape=replace"))
r = rule_line_add_token(rule_line, TK_A_OPTIONS_STRING_ESCAPE_REPLACE, op, NULL, NULL, /* is_case_insensitive = */ false, token_str);
@@ -2551,6 +2556,32 @@ static int udev_rule_apply_token_to_event(
case TK_M_RESULT:
return token_match_string(event, token, event->program_result, /* log_result = */ true);
case TK_A_OPTIONS_DUMP: {
log_event_info(event, token, "Dumping current state:");
if (event->event_mode == EVENT_UDEV_WORKER) {
_cleanup_(memstream_done) MemStream m = {};
FILE *f = memstream_init(&m);
if (!f)
return log_oom();
dump_event(event, f);
_cleanup_free_ char *buf = NULL;
r = memstream_finalize(&m, &buf, NULL);
if (r < 0)
log_event_warning_errno(event, token, r, "Failed to finalize memory stream, ignoring: %m");
else
log_info("%s", buf);
} else {
puts("============================");
dump_event(event, NULL);
puts("============================");
}
log_event_info(event, token, "DONE");
return true;
}
case TK_A_OPTIONS_STRING_ESCAPE_NONE:
event->esc = ESCAPE_NONE;
return log_event_done(event, token);