From 551b21eb0a5ea691d7bce0aff6b1281dd1f98819 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 14 Aug 2024 15:36:22 +0900 Subject: [PATCH] network-generator: ignore kernel command line without value And drop duplicated log messages. --- src/network/generator/network-generator.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c index a8c81c6d11..d6c7d8e7d1 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -893,7 +893,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) @@ -926,7 +926,7 @@ static int parse_cmdline_rd_route(Context *context, const char *key, const char /* rd.route=/:[:] */ if (proc_cmdline_value_missing(key, value)) - return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key); + return 0; const char *p = value; r = extract_ip_address_str(AF_UNSPEC, &p, &buf); @@ -950,7 +950,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, "", value); } @@ -1000,7 +1000,7 @@ static int parse_cmdline_vlan(Context *context, const char *key, const char *val /* vlan=: */ if (proc_cmdline_value_missing(key, value)) - return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key); + return 0; const char *p = value; r = extract_first_word(&p, &name, ":", EXTRACT_DONT_COALESCE_SEPARATORS); @@ -1029,7 +1029,7 @@ static int parse_cmdline_bridge(Context *context, const char *key, const char *v /* bridge=: */ if (proc_cmdline_value_missing(key, value)) - return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key); + return 0; const char *p = value; r = extract_first_word(&p, &name, ":", EXTRACT_DONT_COALESCE_SEPARATORS); @@ -1066,7 +1066,7 @@ static int parse_cmdline_bond(Context *context, const char *key, const char *val /* bond=[::[:[:]]] */ if (proc_cmdline_value_missing(key, value)) - return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key); + return 0; const char *p = value; r = extract_first_word(&p, &name, ":", EXTRACT_DONT_COALESCE_SEPARATORS); @@ -1121,7 +1121,7 @@ static int parse_cmdline_ifname(Context *context, const char *key, const char *v /* ifname=: */ if (proc_cmdline_value_missing(key, value)) - return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Missing value for '%s'", key); + return 0; const char *p = value; r = extract_first_word(&p, &name, ":", EXTRACT_DONT_COALESCE_SEPARATORS); @@ -1154,7 +1154,7 @@ static int parse_cmdline_ifname_policy(Context *context, const char *key, const /* net.ifname_policy=policy1[,policy2,...][,] */ 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; -- 2.25.1