dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Let's make this less confusing, and use the same string externally as
enum name internally.
This commit is contained in:
Lennart Poettering
2023-10-30 17:53:58 +01:00
parent 78101ca9cc
commit ce3e9428ac
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/generator/network-generator.c
View File

@@ -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? */

6
src/network/generator/network-generator.h
View File

@@ -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,