diff options
| author | Michael Brown | 2011-03-23 12:57:29 +0100 |
|---|---|---|
| committer | Michael Brown | 2011-03-23 12:57:29 +0100 |
| commit | 8482451812d6b48e65a1016447f30591099ded62 (patch) | |
| tree | bef63118eeba5e9435fd6c00ec9bf4995ff71499 /src/net/udp | |
| parent | [settings] Fix setting expansion (diff) | |
| download | ipxe-8482451812d6b48e65a1016447f30591099ded62.tar.gz ipxe-8482451812d6b48e65a1016447f30591099ded62.tar.xz ipxe-8482451812d6b48e65a1016447f30591099ded62.zip | |
[settings] Impose a fixed order on settings
Improve the appearance of the "config" user interface by ensuring that
settings appear in some kind of logical order.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/udp')
| -rw-r--r-- | src/net/udp/dhcp.c | 6 | ||||
| -rw-r--r-- | src/net/udp/dns.c | 4 | ||||
| -rw-r--r-- | src/net/udp/syslog.c | 2 | ||||
| -rw-r--r-- | src/net/udp/tftp.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index e6d127ab7..d4f4ede41 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -93,7 +93,7 @@ static uint8_t dhcp_request_options_data[] = { FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH ); /** DHCP server address setting */ -struct setting dhcp_server_setting __setting = { +struct setting dhcp_server_setting __setting ( SETTING_MISC ) = { .name = "dhcp-server", .description = "DHCP server address", .tag = DHCP_SERVER_IDENTIFIER, @@ -101,7 +101,7 @@ struct setting dhcp_server_setting __setting = { }; /** DHCP user class setting */ -struct setting user_class_setting __setting = { +struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = { .name = "user-class", .description = "User class identifier", .tag = DHCP_USER_CLASS_ID, @@ -109,7 +109,7 @@ struct setting user_class_setting __setting = { }; /** Use cached network settings */ -struct setting use_cached_setting __setting = { +struct setting use_cached_setting __setting ( SETTING_MISC ) = { .name = "use-cached", .description = "Use cached network settings", .tag = DHCP_EB_USE_CACHED, diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c index 2326284bf..31a355f1b 100644 --- a/src/net/udp/dns.c +++ b/src/net/udp/dns.c @@ -587,7 +587,7 @@ struct resolver dns_resolver __resolver ( RESOLV_NORMAL ) = { */ /** DNS server setting */ -struct setting dns_setting __setting = { +struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = { .name = "dns", .description = "DNS server", .tag = DHCP_DNS_SERVERS, @@ -595,7 +595,7 @@ struct setting dns_setting __setting = { }; /** Domain name setting */ -struct setting domain_setting __setting = { +struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = { .name = "domain", .description = "Local domain", .tag = DHCP_DOMAIN_NAME, diff --git a/src/net/udp/syslog.c b/src/net/udp/syslog.c index f81ba2f8c..6d9fc2165 100644 --- a/src/net/udp/syslog.c +++ b/src/net/udp/syslog.c @@ -146,7 +146,7 @@ struct console_driver syslog_console __console_driver = { */ /** Syslog server setting */ -struct setting syslog_setting __setting = { +struct setting syslog_setting __setting ( SETTING_MISC ) = { .name = "syslog", .description = "Syslog server", .tag = DHCP_LOG_SERVERS, diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c index 777632ef9..f4e9f4c61 100644 --- a/src/net/udp/tftp.c +++ b/src/net/udp/tftp.c @@ -1215,7 +1215,7 @@ struct uri_opener mtftp_uri_opener __uri_opener = { */ /** TFTP server setting */ -struct setting next_server_setting __setting = { +struct setting next_server_setting __setting ( SETTING_BOOT ) = { .name = "next-server", .description = "TFTP server", .tag = DHCP_EB_SIADDR, |