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 f1bcc32591445be0c1824d56d39f3f3f669d0d2f..0819d4432ca9dfa919c4b4a557d4debdd6e6302c 100644 (file)
--- 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 0e0da2a57af2ed66734e223166e7600900bcc77a..7350933d69a19bdeda9b36b97941f727f8ccdf3f 100644 (file)
--- 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,