From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 30 Oct 2023 16:53:58 +0000 (+0100)
Subject: network-generator: name enum for "ip=dhcp" case same as literal string
X-Git-Tag: v255-rc1~89^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce3e9428acbcb7fe6b7a7fc4f0f0fa863917ebcf;p=thirdparty%2Fsystemd.git

network-generator: name enum for "ip=dhcp" case same as literal string

Let's make this less confusing, and use the same string externally as
enum name internally.
---

diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index f1bcc325914..0819d4432ca 100644
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -48,7 +48,7 @@ static const char * const dracut_dhcp_type_table[_DHCP_TYPE_MAX] = {
         [DHCP_TYPE_OFF]     = "off",
         [DHCP_TYPE_ON]      = "on",
         [DHCP_TYPE_ANY]     = "any",
-        [DHCP_TYPE_DHCP4]   = "dhcp",
+        [DHCP_TYPE_DHCP]    = "dhcp",
         [DHCP_TYPE_DHCP6]   = "dhcp6",
         [DHCP_TYPE_AUTO6]   = "auto6",
         [DHCP_TYPE_EITHER6] = "either6",
@@ -63,7 +63,7 @@ static const char * const networkd_dhcp_type_table[_DHCP_TYPE_MAX] = {
         [DHCP_TYPE_OFF]     = "no",
         [DHCP_TYPE_ON]      = "yes",
         [DHCP_TYPE_ANY]     = "yes",
-        [DHCP_TYPE_DHCP4]   = "ipv4",
+        [DHCP_TYPE_DHCP]    = "ipv4",
         [DHCP_TYPE_DHCP6]   = "ipv6",
         [DHCP_TYPE_AUTO6]   = "no",   /* TODO: enable other setting? */
         [DHCP_TYPE_EITHER6] = "ipv6", /* TODO: enable other setting? */
diff --git a/src/network/generator/network-generator.h b/src/network/generator/network-generator.h
index 0e0da2a57af..7350933d69a 100644
--- a/src/network/generator/network-generator.h
+++ b/src/network/generator/network-generator.h
@@ -10,10 +10,10 @@
 
 typedef enum DHCPType {
         DHCP_TYPE_NONE,
-        DHCP_TYPE_OFF,
+        DHCP_TYPE_OFF,   /* Same as DHCP_TYPE_NONE */
         DHCP_TYPE_ON,
-        DHCP_TYPE_ANY,
-        DHCP_TYPE_DHCP4,
+        DHCP_TYPE_ANY,   /* Same as DHCP_TYPE_ON */
+        DHCP_TYPE_DHCP,  /* Actually means: DHCPv4 */
         DHCP_TYPE_DHCP6,
         DHCP_TYPE_AUTO6,
         DHCP_TYPE_EITHER6,