You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
3.5 KiB
59 lines
3.5 KiB
8 months ago
|
From d808bd97790dd8a38d844c827d2d9dbcb700d8c0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Mon, 9 Jan 2023 11:20:35 +0900
|
||
|
|
Subject: [PATCH] udev: align table
|
||
|
|
|
||
|
|
(cherry picked from commit bb1234d1d6b7b14424093a917890bb4013b4ff3e)
|
||
|
|
|
||
|
|
Related: RHEL-5988
|
||
|
|
---
|
||
|
|
src/udev/udev-event.c | 34 +++++++++++++++++-----------------
|
||
|
|
1 file changed, 17 insertions(+), 17 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
|
||
|
|
index 08d69cf1f0..3ac12d9b52 100644
|
||
|
|
--- a/src/udev/udev-event.c
|
||
|
|
+++ b/src/udev/udev-event.c
|
||
|
|
@@ -119,24 +119,24 @@ struct subst_map_entry {
|
||
|
|
};
|
||
|
|
|
||
|
|
static const struct subst_map_entry map[] = {
|
||
|
|
- { .name = "devnode", .fmt = 'N', .type = FORMAT_SUBST_DEVNODE },
|
||
|
|
- { .name = "tempnode", .fmt = 'N', .type = FORMAT_SUBST_DEVNODE }, /* deprecated */
|
||
|
|
- { .name = "attr", .fmt = 's', .type = FORMAT_SUBST_ATTR },
|
||
|
|
- { .name = "sysfs", .fmt = 's', .type = FORMAT_SUBST_ATTR }, /* deprecated */
|
||
|
|
- { .name = "env", .fmt = 'E', .type = FORMAT_SUBST_ENV },
|
||
|
|
- { .name = "kernel", .fmt = 'k', .type = FORMAT_SUBST_KERNEL },
|
||
|
|
+ { .name = "devnode", .fmt = 'N', .type = FORMAT_SUBST_DEVNODE },
|
||
|
|
+ { .name = "tempnode", .fmt = 'N', .type = FORMAT_SUBST_DEVNODE }, /* deprecated */
|
||
|
|
+ { .name = "attr", .fmt = 's', .type = FORMAT_SUBST_ATTR },
|
||
|
|
+ { .name = "sysfs", .fmt = 's', .type = FORMAT_SUBST_ATTR }, /* deprecated */
|
||
|
|
+ { .name = "env", .fmt = 'E', .type = FORMAT_SUBST_ENV },
|
||
|
|
+ { .name = "kernel", .fmt = 'k', .type = FORMAT_SUBST_KERNEL },
|
||
|
|
{ .name = "number", .fmt = 'n', .type = FORMAT_SUBST_KERNEL_NUMBER },
|
||
|
|
- { .name = "driver", .fmt = 'd', .type = FORMAT_SUBST_DRIVER },
|
||
|
|
- { .name = "devpath", .fmt = 'p', .type = FORMAT_SUBST_DEVPATH },
|
||
|
|
- { .name = "id", .fmt = 'b', .type = FORMAT_SUBST_ID },
|
||
|
|
- { .name = "major", .fmt = 'M', .type = FORMAT_SUBST_MAJOR },
|
||
|
|
- { .name = "minor", .fmt = 'm', .type = FORMAT_SUBST_MINOR },
|
||
|
|
- { .name = "result", .fmt = 'c', .type = FORMAT_SUBST_RESULT },
|
||
|
|
- { .name = "parent", .fmt = 'P', .type = FORMAT_SUBST_PARENT },
|
||
|
|
- { .name = "name", .fmt = 'D', .type = FORMAT_SUBST_NAME },
|
||
|
|
- { .name = "links", .fmt = 'L', .type = FORMAT_SUBST_LINKS },
|
||
|
|
- { .name = "root", .fmt = 'r', .type = FORMAT_SUBST_ROOT },
|
||
|
|
- { .name = "sys", .fmt = 'S', .type = FORMAT_SUBST_SYS },
|
||
|
|
+ { .name = "driver", .fmt = 'd', .type = FORMAT_SUBST_DRIVER },
|
||
|
|
+ { .name = "devpath", .fmt = 'p', .type = FORMAT_SUBST_DEVPATH },
|
||
|
|
+ { .name = "id", .fmt = 'b', .type = FORMAT_SUBST_ID },
|
||
|
|
+ { .name = "major", .fmt = 'M', .type = FORMAT_SUBST_MAJOR },
|
||
|
|
+ { .name = "minor", .fmt = 'm', .type = FORMAT_SUBST_MINOR },
|
||
|
|
+ { .name = "result", .fmt = 'c', .type = FORMAT_SUBST_RESULT },
|
||
|
|
+ { .name = "parent", .fmt = 'P', .type = FORMAT_SUBST_PARENT },
|
||
|
|
+ { .name = "name", .fmt = 'D', .type = FORMAT_SUBST_NAME },
|
||
|
|
+ { .name = "links", .fmt = 'L', .type = FORMAT_SUBST_LINKS },
|
||
|
|
+ { .name = "root", .fmt = 'r', .type = FORMAT_SUBST_ROOT },
|
||
|
|
+ { .name = "sys", .fmt = 'S', .type = FORMAT_SUBST_SYS },
|
||
|
|
};
|
||
|
|
|
||
|
|
static const char *format_type_to_string(FormatSubstitutionType t) {
|