From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 15 Feb 2019 18:53:36 +0000 (+0900)
Subject: udev-rules: update log messages about OWNER= or GROUP= settings on --resolve=names... 
X-Git-Tag: v242-rc1~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57f08d5cddacedb417f0091dbf761fb5fa85f23b;p=thirdparty%2Fsystemd.git

udev-rules: update log messages about OWNER= or GROUP= settings on --resolve=names=never

This also set lower log level for the messages.

6e2efb6c739784deb026726331fe7e7365080f8b introduces the log messages.
But udevd may be started with --resolve-names=never, and the behavior
is expected.

Fixes #11720.
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 8dfffe24f77..8603c75cb6e 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1384,7 +1384,7 @@ static void add_rule(UdevRules *rules, char *line,
                         } else if (rules->resolve_name_timing != RESOLVE_NAME_NEVER)
                                 r = rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
                         else {
-                                LOG_RULE_ERROR("Invalid %s operation", key);
+                                LOG_RULE_DEBUG("Resolving user name is disabled, ignoring %s=%s", key, value);
                                 continue;
                         }
                         if (r < 0)
@@ -1408,7 +1408,7 @@ static void add_rule(UdevRules *rules, char *line,
                         } else if (rules->resolve_name_timing != RESOLVE_NAME_NEVER)
                                 r = rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
                         else {
-                                LOG_RULE_ERROR("Invalid %s operation", key);
+                                LOG_RULE_DEBUG("Resolving group name is disabled, ignoring %s=%s", key, value);
                                 continue;
                         }
                         if (r < 0)