From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 14 Aug 2024 06:36:22 +0000 (+0900)
Subject: network-generator: ignore kernel command line without value
X-Git-Tag: v256.8~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74f85451cb9e145df4b99a17d0aa6ff551a16ce3;p=thirdparty%2Fsystemd.git

network-generator: ignore kernel command line without value

And drop duplicated log messages.

(cherry picked from commit 551b21eb0a5ea691d7bce0aff6b1281dd1f98819)
---

diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index e1f4e598c6a..f482c973baa 100644
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -873,7 +873,7 @@ static int parse_cmdline_ip(Context *context, const char *key, const char *value
         assert(key);
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         p = strchr(value, ':');
         if (!p)
@@ -902,7 +902,7 @@ static int parse_cmdline_rd_route(Context *context, const char *key, const char
         /* rd.route=<net>/<netmask>:<gateway>[:<interface>] */
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         if (value[0] == '[') {
                 p = strchr(value, ']');
@@ -945,7 +945,7 @@ static int parse_cmdline_nameserver(Context *context, const char *key, const cha
         assert(key);
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         return network_set_dns(context, "", AF_UNSPEC, value);
 }
@@ -993,7 +993,7 @@ static int parse_cmdline_vlan(Context *context, const char *key, const char *val
         assert(key);
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         p = strchr(value, ':');
         if (!p)
@@ -1024,7 +1024,7 @@ static int parse_cmdline_bridge(Context *context, const char *key, const char *v
         assert(key);
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         p = strchr(value, ':');
         if (!p)
@@ -1065,7 +1065,7 @@ static int parse_cmdline_bond(Context *context, const char *key, const char *val
         assert(key);
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         p = strchr(value, ':');
         if (!p)
@@ -1124,7 +1124,7 @@ static int parse_cmdline_ifname(Context *context, const char *key, const char *v
         /* ifname=<interface>:<MAC> */
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         p = strchr(value, ':');
         if (!p)
@@ -1155,7 +1155,7 @@ static int parse_cmdline_ifname_policy(Context *context, const char *key, const
         /* net.ifname_policy=policy1[,policy2,...][,<MAC>] */
 
         if (proc_cmdline_value_missing(key, value))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key);
+                return 0;
 
         for (const char *q = value; ; ) {
                 _cleanup_free_ char *word = NULL;