sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-02-07 19:38:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

[settings] Force settings into alphabetical order within sections

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2013-12-05 12:38:51 +00:00
parent 8aab959bed
commit b0942534eb
19 changed files with 158 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/80211/net80211.c
View File

@@ -204,7 +204,8 @@ struct settings_applicator net80211_applicator __settings_applicator = {
* If this is blank, we scan for all networks and use the one with the
* greatest signal strength.
*/
const struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA ) = {
const struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA,
ssid ) = {
.name = "ssid",
.description = "Wireless SSID",
.type = &setting_type_string,
@@ -216,7 +217,8 @@ const struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA ) =
* active scan (send probe packets). If this setting is nonzero, an
* active scan on the 2.4GHz band will be used to associate.
*/
const struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA ) = {
const struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA,
active-scan ) = {
.name = "active-scan",
.description = "Actively scan for wireless networks",
.type = &setting_type_int8,
@@ -228,7 +230,8 @@ const struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA )
* normal iPXE method for entering hex settings; an ASCII string of
* hex characters will not behave as expected.
*/
const struct setting net80211_key_setting __setting ( SETTING_NETDEV_EXTRA ) = {
const struct setting net80211_key_setting __setting ( SETTING_NETDEV_EXTRA,
key ) = {
.name = "key",
.description = "Wireless encryption key",
.type = &setting_type_string,

6
src/net/ipv4.c
View File

@@ -636,7 +636,7 @@ int format_ipv4_setting ( const struct setting_type *type __unused,
}
/** IPv4 address setting */
const struct setting ip_setting __setting ( SETTING_IPv4 ) = {
const struct setting ip_setting __setting ( SETTING_IPv4, ip ) = {
.name = "ip",
.description = "IP address",
.tag = DHCP_EB_YIADDR,
@@ -644,7 +644,7 @@ const struct setting ip_setting __setting ( SETTING_IPv4 ) = {
};
/** IPv4 subnet mask setting */
const struct setting netmask_setting __setting ( SETTING_IPv4 ) = {
const struct setting netmask_setting __setting ( SETTING_IPv4, netmask ) = {
.name = "netmask",
.description = "Subnet mask",
.tag = DHCP_SUBNET_MASK,
@@ -652,7 +652,7 @@ const struct setting netmask_setting __setting ( SETTING_IPv4 ) = {
};
/** Default gateway setting */
const struct setting gateway_setting __setting ( SETTING_IPv4 ) = {
const struct setting gateway_setting __setting ( SETTING_IPv4, gateway ) = {
.name = "gateway",
.description = "Default gateway",
.tag = DHCP_ROUTERS,

10
src/net/netdev_settings.c
View File

@@ -36,27 +36,27 @@ FILE_LICENCE ( GPL2_OR_LATER );
*/
/** Network device predefined settings */
const struct setting mac_setting __setting ( SETTING_NETDEV ) = {
const struct setting mac_setting __setting ( SETTING_NETDEV, mac ) = {
.name = "mac",
.description = "MAC address",
.type = &setting_type_hex,
};
const struct setting bustype_setting __setting ( SETTING_NETDEV ) = {
const struct setting bustype_setting __setting ( SETTING_NETDEV, bustype ) = {
.name = "bustype",
.description = "Bus type",
.type = &setting_type_string,
};
const struct setting busloc_setting __setting ( SETTING_NETDEV ) = {
const struct setting busloc_setting __setting ( SETTING_NETDEV, busloc ) = {
.name = "busloc",
.description = "Bus location",
.type = &setting_type_uint32,
};
const struct setting busid_setting __setting ( SETTING_NETDEV ) = {
const struct setting busid_setting __setting ( SETTING_NETDEV, busid ) = {
.name = "busid",
.description = "Bus ID",
.type = &setting_type_hex,
};
const struct setting chip_setting __setting ( SETTING_NETDEV ) = {
const struct setting chip_setting __setting ( SETTING_NETDEV, chip ) = {
.name = "chip",
.description = "Chip",
.type = &setting_type_string,

9
src/net/tcp/iscsi.c
View File

@@ -1860,7 +1860,8 @@ enum iscsi_root_path_component {
};
/** iSCSI initiator IQN setting */
const struct setting initiator_iqn_setting __setting ( SETTING_SANBOOT_EXTRA ) = {
const struct setting initiator_iqn_setting __setting ( SETTING_SANBOOT_EXTRA,
initiator-iqn ) = {
.name = "initiator-iqn",
.description = "iSCSI initiator name",
.tag = DHCP_ISCSI_INITIATOR_IQN,
@@ -1868,7 +1869,8 @@ const struct setting initiator_iqn_setting __setting ( SETTING_SANBOOT_EXTRA ) =
};
/** iSCSI reverse username setting */
const struct setting reverse_username_setting __setting ( SETTING_AUTH_EXTRA ) = {
const struct setting reverse_username_setting __setting ( SETTING_AUTH_EXTRA,
reverse-username ) = {
.name = "reverse-username",
.description = "Reverse user name",
.tag = DHCP_EB_REVERSE_USERNAME,
@@ -1876,7 +1878,8 @@ const struct setting reverse_username_setting __setting ( SETTING_AUTH_EXTRA ) =
};
/** iSCSI reverse password setting */
const struct setting reverse_password_setting __setting ( SETTING_AUTH_EXTRA ) = {
const struct setting reverse_password_setting __setting ( SETTING_AUTH_EXTRA,
reverse-password ) = {
.name = "reverse-password",
.description = "Reverse password",
.tag = DHCP_EB_REVERSE_PASSWORD,

4
src/net/tcp/oncrpc.c
View File

@@ -58,14 +58,14 @@ struct oncrpc_cred oncrpc_auth_none = {
.length = 0
};
const struct setting uid_setting __setting ( SETTING_AUTH ) = {
const struct setting uid_setting __setting ( SETTING_AUTH, uid ) = {
.name = "uid",
.description = "User ID",
.tag = DHCP_EB_UID,
.type = &setting_type_uint32
};
const struct setting gid_setting __setting ( SETTING_AUTH ) = {
const struct setting gid_setting __setting ( SETTING_AUTH, gid ) = {
.name = "gid",
.description = "Group ID",
.tag = DHCP_EB_GID,

2
src/net/tcp/syslogs.c
View File

@@ -189,7 +189,7 @@ struct console_driver syslogs_console __console_driver = {
*/
/** Encrypted syslog server setting */
const struct setting syslogs_setting __setting ( SETTING_MISC ) = {
const struct setting syslogs_setting __setting ( SETTING_MISC, syslogs ) = {
.name = "syslogs",
.description = "Encrypted syslog server",
.tag = DHCP_EB_SYSLOGS_SERVER,

3
src/net/udp/dhcp.c
View File

@@ -92,7 +92,8 @@ static uint8_t dhcp_request_options_data[] = {
};
/** DHCP server address setting */
const struct setting dhcp_server_setting __setting ( SETTING_MISC ) = {
const struct setting dhcp_server_setting __setting ( SETTING_MISC,
dhcp-server ) = {
.name = "dhcp-server",
.description = "DHCP server",
.tag = DHCP_SERVER_IDENTIFIER,

4
src/net/udp/dns.c
View File

@@ -652,7 +652,7 @@ struct resolver dns_resolver __resolver ( RESOLV_NORMAL ) = {
*/
/** IPv4 DNS server setting */
const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = {
const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA, dns ) = {
.name = "dns",
.description = "DNS server",
.tag = DHCP_DNS_SERVERS,
@@ -660,7 +660,7 @@ const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = {
};
/** IPv6 DNS server setting */
const struct setting dns6_setting __setting ( SETTING_IPv6_EXTRA ) = {
const struct setting dns6_setting __setting ( SETTING_IPv6_EXTRA, dns6 ) = {
.name = "dns6",
.description = "DNS server",
.tag = DHCPV6_DNS_SERVERS,

4
src/net/udp/syslog.c
View File

@@ -195,7 +195,7 @@ struct console_driver syslog_console __console_driver = {
*/
/** IPv4 syslog server setting */
const struct setting syslog_setting __setting ( SETTING_MISC ) = {
const struct setting syslog_setting __setting ( SETTING_MISC, syslog ) = {
.name = "syslog",
.description = "Syslog server",
.tag = DHCP_LOG_SERVERS,
@@ -203,7 +203,7 @@ const struct setting syslog_setting __setting ( SETTING_MISC ) = {
};
/** IPv6 syslog server setting */
const struct setting syslog6_setting __setting ( SETTING_MISC ) = {
const struct setting syslog6_setting __setting ( SETTING_MISC, syslog6 ) = {
.name = "syslog6",
.description = "Syslog server",
.tag = DHCPV6_LOG_SERVERS,

2
src/net/validator.c
View File

@@ -121,7 +121,7 @@ static struct interface_descriptor validator_job_desc =
*/
/** Cross-signed certificate source setting */
const struct setting crosscert_setting __setting ( SETTING_CRYPTO ) = {
const struct setting crosscert_setting __setting ( SETTING_CRYPTO, crosscert )={
.name = "crosscert",
.description = "Cross-signed certificate source",
.tag = DHCP_EB_CROSS_CERT,