From 5abba26e2f9eb9336e701228220f0ef62c95f316 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 9 Sep 2019 01:27:56 +0900 Subject: udev: add missing flag for OPTIONS=static_node Fixes RHBZ#1740664. --- src/udev/udev-rules.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 1642f10535..21f84b25ce 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -499,6 +499,9 @@ static int rule_line_add_token(UdevRuleLine *rule_line, UdevRuleTokenType type, TK_A_OWNER_ID, TK_A_GROUP_ID, TK_A_MODE_ID)) SET_FLAG(rule_line->type, LINE_HAS_DEVLINK, true); + else if (token->type == TK_A_OPTIONS_STATIC_NODE) + SET_FLAG(rule_line->type, LINE_HAS_STATIC_NODE, true); + else if (token->type >= _TK_A_MIN || IN_SET(token->type, TK_M_PROGRAM, TK_M_IMPORT_FILE, TK_M_IMPORT_PROGRAM, TK_M_IMPORT_BUILTIN, -- cgit v1.2.1 From 20eef7c55cfdd83f953c6a332aaad0caba4fb60f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 9 Sep 2019 01:29:27 +0900 Subject: udev: also logs file permission --- src/udev/udev-rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 21f84b25ce..8631a26c98 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -2304,7 +2304,7 @@ static int apply_static_dev_perms(const char *devnode, uid_t uid, gid_t gid, mod return log_error_errno(errno, "Failed to chown '%s' %u %u: %m", device_node, uid, gid); else - log_debug("chown '%s' %u:%u", device_node, uid, gid); + log_debug("chown '%s' %u:%u with mode %#o", device_node, uid, gid, mode); (void) utimensat(AT_FDCWD, device_node, NULL, 0); return 0; -- cgit v1.2.1