diff options
| author | Michael Brown | 2013-12-05 16:11:15 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-12-05 16:11:15 +0100 |
| commit | f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d (patch) | |
| tree | 878418a9722ed7a826d214792859883d8d5e4be4 /src/core/settings.c | |
| parent | [settings] Allow for multiple definitions of each predefined setting (diff) | |
| download | ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.tar.gz ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.tar.xz ipxe-f3e5df3162b9e9dec0e91e59ad2567bcc78ef03d.zip | |
[settings] Merge SETTING_IPv4 and SETTING_IPv6
Allow for equivalent IPv4 and IPv6 settings (which requires equivalent
settings to be adjacent within the settings list).
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/core/settings.c')
| -rw-r--r-- | src/core/settings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/settings.c b/src/core/settings.c index 1f99bca8..1f742548 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -2346,7 +2346,7 @@ const struct setting hostname_setting __setting ( SETTING_HOST, hostname ) = { }; /** Domain name setting */ -const struct setting domain_setting __setting ( SETTING_IPv4_EXTRA, domain ) = { +const struct setting domain_setting __setting ( SETTING_IP_EXTRA, domain ) = { .name = "domain", .description = "DNS domain", .tag = DHCP_DOMAIN_NAME, |