diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-12 17:36:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 17:36:34 +0200 |
| commit | f255a21f67c2471681dc1c748a8bd58647e85f12 (patch) | |
| tree | 40876fe73fa57a4bf071ae64b3c4453b9ffc471f | |
| parent | 807f9a170035c46406973d4df2ac1833105c699a (diff) | |
| parent | 20eef7c55cfdd83f953c6a332aaad0caba4fb60f (diff) | |
| download | systemd-f255a21f67c2471681dc1c748a8bd58647e85f12.tar.gz | |
Merge pull request #13500 from yuwata/udev-fix-static_node
udev: add missing flag for OPTIONS=static_node
| -rw-r--r-- | src/udev/udev-rules.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 1642f10535..8631a26c98 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, @@ -2301,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; |