[settings] Force settings into alphabetical order within sections

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/x86/core/cpuid_settings.c b/src/arch/x86/core/cpuid_settings.c
index 2da859ee90ca0ec59d71faa4bafaf8543d1d36b1..42dea9336d3cffe8dc8f579dfe8d5f67337242c7 100644 (file)
--- a/src/arch/x86/core/cpuid_settings.c
+++ b/src/arch/x86/core/cpuid_settings.c
@@ -251,22 +251,24 @@ struct init_fn cpuid_settings_init_fn __init_fn ( INIT_NORMAL ) = {
        .initialise = cpuid_settings_init,
 };
 
-/** CPUID predefined settings */
-const struct setting cpuid_predefined_settings[] __setting ( SETTING_HOST_EXTRA ) = {
-       {
-               .name = "cpuvendor",
-               .description = "CPU vendor",
-               .tag = CPUID_TAG ( CPUID_VENDOR_ID, 1, 1, 3,
-                                  CPUID_EBX, CPUID_EDX, CPUID_ECX, 0 ),
-               .type = &setting_type_string,
-               .scope = &cpuid_settings_scope,
-       },
-       {
-               .name = "cpumodel",
-               .description = "CPU model",
-               .tag = CPUID_TAG ( CPUID_MODEL, 3, 1, 4,
-                                  CPUID_EAX, CPUID_EBX, CPUID_ECX, CPUID_EDX ),
-               .type = &setting_type_string,
-               .scope = &cpuid_settings_scope,
-       },
+/** CPU vendor setting */
+const struct setting cpuvendor_setting __setting ( SETTING_HOST_EXTRA,
+                                                  cpuvendor ) = {
+       .name = "cpuvendor",
+       .description = "CPU vendor",
+       .tag = CPUID_TAG ( CPUID_VENDOR_ID, 1, 1, 3,
+                          CPUID_EBX, CPUID_EDX, CPUID_ECX, 0 ),
+       .type = &setting_type_string,
+       .scope = &cpuid_settings_scope,
+};
+
+/** CPU model setting */
+const struct setting cpumodel_setting __setting ( SETTING_HOST_EXTRA,
+                                                 cpumodel ) = {
+       .name = "cpumodel",
+       .description = "CPU model",
+       .tag = CPUID_TAG ( CPUID_MODEL, 3, 1, 4,
+                          CPUID_EAX, CPUID_EBX, CPUID_ECX, CPUID_EDX ),
+       .type = &setting_type_string,
+       .scope = &cpuid_settings_scope,
 };

diff --git a/src/core/memmap_settings.c b/src/core/memmap_settings.c
index 906fba128ebbf34e44ffdf28f167a83e49f73172..0f6d0abf5a4f6d65e855379ff3907d5bdcab1fa9 100644 (file)
--- a/src/core/memmap_settings.c
+++ b/src/core/memmap_settings.c
@@ -231,12 +231,10 @@ struct init_fn memmap_settings_init_fn __init_fn ( INIT_NORMAL ) = {
 };
 
 /** Memory map predefined settings */
-const struct setting memmap_predefined_settings[] __setting ( SETTING_MISC ) = {
-       {
-               .name = "memsize",
-               .description = "Memory size (in MB)",
-               .tag = MEMMAP_TAG ( 0, 0x100, 0, 1, 1, 20 ),
-               .type = &setting_type_int32,
-               .scope = &memmap_settings_scope,
-       },
+const struct setting memsize_setting __setting ( SETTING_MISC, memsize ) = {
+       .name = "memsize",
+       .description = "Memory size (in MB)",
+       .tag = MEMMAP_TAG ( 0, 0x100, 0, 1, 1, 20 ),
+       .type = &setting_type_int32,
+       .scope = &memmap_settings_scope,
 };

diff --git a/src/core/settings.c b/src/core/settings.c
index 1269c9a30b9548fb794fa3b7135d98cefb327b20..8ce2af2b3200881cc051309f083260d6e7bae30c 100644 (file)
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -2312,7 +2312,7 @@ char * expand_settings ( const char *string ) {
  */
 
 /** Hostname setting */
-const struct setting hostname_setting __setting ( SETTING_HOST ) = {
+const struct setting hostname_setting __setting ( SETTING_HOST, hostname ) = {
        .name = "hostname",
        .description = "Host name",
        .tag = DHCP_HOST_NAME,
@@ -2320,7 +2320,7 @@ const struct setting hostname_setting __setting ( SETTING_HOST ) = {
 };
 
 /** Domain name setting */
-const struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = {
+const struct setting domain_setting __setting ( SETTING_IPv4_EXTRA, domain ) = {
        .name = "domain",
        .description = "DNS domain",
        .tag = DHCP_DOMAIN_NAME,
@@ -2328,7 +2328,7 @@ const struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = {
 };
 
 /** TFTP server setting */
-const struct setting next_server_setting __setting ( SETTING_BOOT ) = {
+const struct setting next_server_setting __setting ( SETTING_BOOT,next-server)={
        .name = "next-server",
        .description = "TFTP server",
        .tag = DHCP_EB_SIADDR,
@@ -2336,7 +2336,7 @@ const struct setting next_server_setting __setting ( SETTING_BOOT ) = {
 };
 
 /** Filename setting */
-const struct setting filename_setting __setting ( SETTING_BOOT ) = {
+const struct setting filename_setting __setting ( SETTING_BOOT, filename ) = {
        .name = "filename",
        .description = "Boot filename",
        .tag = DHCP_BOOTFILE_NAME,
@@ -2344,7 +2344,7 @@ const struct setting filename_setting __setting ( SETTING_BOOT ) = {
 };
 
 /** Root path setting */
-const struct setting root_path_setting __setting ( SETTING_SANBOOT ) = {
+const struct setting root_path_setting __setting ( SETTING_SANBOOT, root-path)={
        .name = "root-path",
        .description = "SAN root path",
        .tag = DHCP_ROOT_PATH,
@@ -2352,7 +2352,7 @@ const struct setting root_path_setting __setting ( SETTING_SANBOOT ) = {
 };
 
 /** Username setting */
-const struct setting username_setting __setting ( SETTING_AUTH ) = {
+const struct setting username_setting __setting ( SETTING_AUTH, username ) = {
        .name = "username",
        .description = "User name",
        .tag = DHCP_EB_USERNAME,
@@ -2360,7 +2360,7 @@ const struct setting username_setting __setting ( SETTING_AUTH ) = {
 };
 
 /** Password setting */
-const struct setting password_setting __setting ( SETTING_AUTH ) = {
+const struct setting password_setting __setting ( SETTING_AUTH, password ) = {
        .name = "password",
        .description = "Password",
        .tag = DHCP_EB_PASSWORD,
@@ -2368,7 +2368,7 @@ const struct setting password_setting __setting ( SETTING_AUTH ) = {
 };
 
 /** Priority setting */
-const struct setting priority_setting __setting ( SETTING_MISC ) = {
+const struct setting priority_setting __setting ( SETTING_MISC, priority ) = {
        .name = "priority",
        .description = "Settings priority",
        .tag = DHCP_EB_PRIORITY,
@@ -2376,7 +2376,8 @@ const struct setting priority_setting __setting ( SETTING_MISC ) = {
 };
 
 /** DHCP user class setting */
-const struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
+const struct setting user_class_setting __setting ( SETTING_HOST_EXTRA,
+                                                   user-class ) = {
        .name = "user-class",
        .description = "DHCP user class",
        .tag = DHCP_USER_CLASS_ID,
@@ -2412,7 +2413,7 @@ static int errno_fetch ( void *data, size_t len ) {
 }
 
 /** Error number setting */
-const struct setting errno_setting __setting ( SETTING_MISC ) = {
+const struct setting errno_setting __setting ( SETTING_MISC, errno ) = {
        .name = "errno",
        .description = "Last error",
        .type = &setting_type_uint32,
@@ -2440,7 +2441,7 @@ static int buildarch_fetch ( void *data, size_t len ) {
 }
 
 /** Build architecture setting */
-const struct setting buildarch_setting __setting ( SETTING_MISC ) = {
+const struct setting buildarch_setting __setting ( SETTING_MISC, buildarch ) = {
        .name = "buildarch",
        .description = "Build architecture",
        .type = &setting_type_string,
@@ -2468,7 +2469,7 @@ static int platform_fetch ( void *data, size_t len ) {
 }
 
 /** Platform setting */
-const struct setting platform_setting __setting ( SETTING_MISC ) = {
+const struct setting platform_setting __setting ( SETTING_MISC, platform ) = {
        .name = "platform",
        .description = "Platform",
        .type = &setting_type_string,
@@ -2494,7 +2495,7 @@ static int version_fetch ( void *data, size_t len ) {
 }
 
 /** Version setting */
-const struct setting version_setting __setting ( SETTING_MISC ) = {
+const struct setting version_setting __setting ( SETTING_MISC, version ) = {
        .name = "version",
        .description = "Version",
        .type = &setting_type_string,

diff --git a/src/crypto/clientcert.c b/src/crypto/clientcert.c
index b09c880ac0f4742200ccd9f095364d91f690b125..3a662865590066b60f48a489498a79380b56af7f 100644 (file)
--- a/src/crypto/clientcert.c
+++ b/src/crypto/clientcert.c
@@ -92,7 +92,7 @@ struct client_private_key client_private_key = {
 };
 
 /** Client certificate setting */
-static struct setting cert_setting __setting ( SETTING_CRYPTO ) = {
+static struct setting cert_setting __setting ( SETTING_CRYPTO, cert ) = {
        .name = "cert",
        .description = "Client certificate",
        .tag = DHCP_EB_CERT,
@@ -100,7 +100,7 @@ static struct setting cert_setting __setting ( SETTING_CRYPTO ) = {
 };
 
 /** Client private key setting */
-static struct setting privkey_setting __setting ( SETTING_CRYPTO ) = {
+static struct setting privkey_setting __setting ( SETTING_CRYPTO, privkey ) = {
        .name = "privkey",
        .description = "Client private key",
        .tag = DHCP_EB_KEY,

diff --git a/src/crypto/rootcert.c b/src/crypto/rootcert.c
index cfeabb815112afd8945efb9537ad859f244c0b1d..ae28905ac43e3cb63515c44f00645bee53827fe7 100644 (file)
--- a/src/crypto/rootcert.c
+++ b/src/crypto/rootcert.c
@@ -58,7 +58,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 static const uint8_t fingerprints[] = { TRUSTED };
 
 /** Root certificate fingerprint setting */
-static struct setting trust_setting __setting ( SETTING_CRYPTO ) = {
+static struct setting trust_setting __setting ( SETTING_CRYPTO, trust ) = {
        .name = "trust",
        .description = "Trusted root certificate fingerprints",
        .tag = DHCP_EB_TRUST,

diff --git a/src/include/ipxe/net80211.h b/src/include/ipxe/net80211.h
index d752382ad5171aac80da26df16e32e78edbd70d6..9ed0fa9b1d06d6f40f4159b8c84f660d8fe60bfe 100644 (file)
--- a/src/include/ipxe/net80211.h
+++ b/src/include/ipxe/net80211.h
@@ -1093,7 +1093,8 @@ struct net80211_wlan
 
 
 /** 802.11 encryption key setting */
-extern const struct setting net80211_key_setting __setting ( SETTING_NETDEV_EXTRA );
+extern const struct setting
+net80211_key_setting __setting ( SETTING_NETDEV_EXTRA, key );
 
 
 /**

diff --git a/src/include/ipxe/settings.h b/src/include/ipxe/settings.h
index 39756f7fdf00ac0689324be90a0be5313eda08df..963647656d80dbc7b22d26eb455872592d3be7e2 100644 (file)
--- a/src/include/ipxe/settings.h
+++ b/src/include/ipxe/settings.h
@@ -53,7 +53,8 @@ struct setting {
 #define SETTINGS __table ( struct setting, "settings" )
 
 /** Declare a configuration setting */
-#define __setting( setting_order ) __table_entry ( SETTINGS, setting_order )
+#define __setting( setting_order, name ) \
+       __table_entry ( SETTINGS, setting_order.name )
 
 /** @defgroup setting_order Setting ordering
  * @{
@@ -419,22 +420,38 @@ extern const struct setting_type setting_type_hexraw __setting_type;
 extern const struct setting_type setting_type_uuid __setting_type;
 extern const struct setting_type setting_type_busdevfn __setting_type;
 
-extern const struct setting ip_setting __setting ( SETTING_IPv4 );
-extern const struct setting netmask_setting __setting ( SETTING_IPv4 );
-extern const struct setting gateway_setting __setting ( SETTING_IPv4 );
-extern const struct setting dns_setting __setting ( SETTING_IPv4_EXTRA );
-extern const struct setting hostname_setting __setting ( SETTING_HOST );
-extern const struct setting domain_setting __setting ( SETTING_IPv4_EXTRA );
-extern const struct setting filename_setting __setting ( SETTING_BOOT );
-extern const struct setting root_path_setting __setting ( SETTING_SANBOOT );
-extern const struct setting username_setting __setting ( SETTING_AUTH );
-extern const struct setting password_setting __setting ( SETTING_AUTH );
-extern const struct setting priority_setting __setting ( SETTING_MISC );
-extern const struct setting uuid_setting __setting ( SETTING_HOST );
-extern const struct setting next_server_setting __setting ( SETTING_BOOT );
-extern const struct setting mac_setting __setting ( SETTING_NETDEV );
-extern const struct setting busid_setting __setting ( SETTING_NETDEV );
-extern const struct setting user_class_setting __setting ( SETTING_HOST_EXTRA );
+extern const struct setting
+ip_setting __setting ( SETTING_IPv4, ip );
+extern const struct setting
+netmask_setting __setting ( SETTING_IPv4, netmask );
+extern const struct setting
+gateway_setting __setting ( SETTING_IPv4, gateway );
+extern const struct setting
+dns_setting __setting ( SETTING_IPv4_EXTRA, dns );
+extern const struct setting
+hostname_setting __setting ( SETTING_HOST, hostname );
+extern const struct setting
+domain_setting __setting ( SETTING_IPv4_EXTRA, domain );
+extern const struct setting
+filename_setting __setting ( SETTING_BOOT, filename );
+extern const struct setting
+root_path_setting __setting ( SETTING_SANBOOT, root-path );
+extern const struct setting
+username_setting __setting ( SETTING_AUTH, username );
+extern const struct setting
+password_setting __setting ( SETTING_AUTH, password );
+extern const struct setting
+priority_setting __setting ( SETTING_MISC, priority );
+extern const struct setting
+uuid_setting __setting ( SETTING_HOST, uuid );
+extern const struct setting
+next_server_setting __setting ( SETTING_BOOT, next-server );
+extern const struct setting
+mac_setting __setting ( SETTING_NETDEV, mac );
+extern const struct setting
+busid_setting __setting ( SETTING_NETDEV, busid );
+extern const struct setting
+user_class_setting __setting ( SETTING_HOST_EXTRA, user-class );
 
 /**
  * Initialise a settings block

diff --git a/src/interface/smbios/smbios_settings.c b/src/interface/smbios/smbios_settings.c
index 9995bd7519053ef2e073cc62f6d65cf90287819f..5dcf00201a98a90c723f2b1ec7f3027797ff2d30 100644 (file)
--- a/src/interface/smbios/smbios_settings.c
+++ b/src/interface/smbios/smbios_settings.c
@@ -188,7 +188,7 @@ struct init_fn smbios_init_fn __init_fn ( INIT_NORMAL ) = {
 };
 
 /** UUID setting obtained via SMBIOS */
-const struct setting uuid_setting __setting ( SETTING_HOST ) = {
+const struct setting uuid_setting __setting ( SETTING_HOST, uuid ) = {
        .name = "uuid",
        .description = "UUID",
        .tag = SMBIOS_RAW_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
@@ -197,42 +197,47 @@ const struct setting uuid_setting __setting ( SETTING_HOST ) = {
        .scope = &smbios_settings_scope,
 };
 
-/** Other SMBIOS predefined settings */
-const struct setting smbios_predefined_settings[] __setting ( SETTING_HOST_EXTRA ) = {
-       {
-               .name = "manufacturer",
-               .description = "Manufacturer",
-               .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
-                                          struct smbios_system_information,
-                                          manufacturer ),
-               .type = &setting_type_string,
-               .scope = &smbios_settings_scope,
-       },
-       {
-               .name = "product",
-               .description = "Product name",
-               .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
-                                          struct smbios_system_information,
-                                          product ),
-               .type = &setting_type_string,
-               .scope = &smbios_settings_scope,
-       },
-       {
-               .name = "serial",
-               .description = "Serial number",
-               .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
-                                          struct smbios_system_information,
-                                          serial ),
-               .type = &setting_type_string,
-               .scope = &smbios_settings_scope,
-       },
-       {
-               .name = "asset",
-               .description = "Asset tag",
-               .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_ENCLOSURE_INFORMATION,
-                                          struct smbios_enclosure_information,
-                                          asset_tag ),
-               .type = &setting_type_string,
-               .scope = &smbios_settings_scope,
-       },
+/** Manufacturer name setting */
+const struct setting manufacturer_setting __setting ( SETTING_HOST_EXTRA,
+                                                     manufacturer ) = {
+       .name = "manufacturer",
+       .description = "Manufacturer",
+       .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
+                                  struct smbios_system_information,
+                                  manufacturer ),
+       .type = &setting_type_string,
+       .scope = &smbios_settings_scope,
+};
+
+/** Product name setting */
+const struct setting product_setting __setting ( SETTING_HOST_EXTRA, product )={
+       .name = "product",
+       .description = "Product name",
+       .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
+                                  struct smbios_system_information,
+                                  product ),
+       .type = &setting_type_string,
+       .scope = &smbios_settings_scope,
+};
+
+/** Serial number setting */
+const struct setting serial_setting __setting ( SETTING_HOST_EXTRA, serial ) = {
+       .name = "serial",
+       .description = "Serial number",
+       .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
+                                  struct smbios_system_information,
+                                  serial ),
+       .type = &setting_type_string,
+       .scope = &smbios_settings_scope,
+};
+
+/** Asset tag setting */
+const struct setting asset_setting __setting ( SETTING_HOST_EXTRA, asset ) = {
+       .name = "asset",
+       .description = "Asset tag",
+       .tag = SMBIOS_STRING_TAG ( SMBIOS_TYPE_ENCLOSURE_INFORMATION,
+                                  struct smbios_enclosure_information,
+                                  asset_tag ),
+       .type = &setting_type_string,
+       .scope = &smbios_settings_scope,
 };

diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index db4dc1168d62383968be58793495161822921a0a..4349445238a2b09b4012c985d15129bd1892014a 100644 (file)
--- a/src/net/80211/net80211.c
+++ b/src/net/80211/net80211.c
@@ -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,

diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index 5d5c3f753ef3c7ef5e7718c11c0a23adcd6f5d57..a9226d54cf5ed74e527142efb886952d8d9a3597 100644 (file)
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -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,

diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c
index cfadd9e4e1dc597a42e8042a023297b860594900..b3b2e68d8b5441772b17e497e6e75c0712c302a1 100644 (file)
--- a/src/net/netdev_settings.c
+++ b/src/net/netdev_settings.c
@@ -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,

diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index 197069cc36793649fec9a9876f1c8546fc103bfb..a6fcd251ba3e4ac508f3777a3f742aabc3a554b6 100644 (file)
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -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,

diff --git a/src/net/tcp/oncrpc.c b/src/net/tcp/oncrpc.c
index 0a3b38580a8185ee31d453371bcefb5a65f0ab08..cd33ece029359a1b22f1d25315f55667edbb1d41 100644 (file)
--- a/src/net/tcp/oncrpc.c
+++ b/src/net/tcp/oncrpc.c
@@ -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,

diff --git a/src/net/tcp/syslogs.c b/src/net/tcp/syslogs.c
index 5180e4dab6117edee96f549889bd8683dd940595..095afc543b2ef406b2063e91f7a933a02e59620a 100644 (file)
--- a/src/net/tcp/syslogs.c
+++ b/src/net/tcp/syslogs.c
@@ -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,

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 3163f39c752fce9b093fb1b07c8690673dcf0dbd..4625d1de4033813171001ca9f3f62441211e1bd1 100644 (file)
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -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,

diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c
index 7e65efd4da4fd9f07e1b4e785b36bb65433d73f5..838c33b609fc05fe02d770d5ecd67373403c8626 100644 (file)
--- a/src/net/udp/dns.c
+++ b/src/net/udp/dns.c
@@ -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,

diff --git a/src/net/udp/syslog.c b/src/net/udp/syslog.c
index 9569f39531af5827cd1d629f8e43a2583d735527..d517371256ccdd6ba13f9743b4fe2945a0c2b764 100644 (file)
--- a/src/net/udp/syslog.c
+++ b/src/net/udp/syslog.c
@@ -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,

diff --git a/src/net/validator.c b/src/net/validator.c
index 56eebe3d6c8ad5b04e25d88876aa0ec5cf849a7a..1de3bb9d1f653f3629235bc120b2979bff97c9eb 100644 (file)
--- a/src/net/validator.c
+++ b/src/net/validator.c
@@ -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,

diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index a29f8c17c585bc6561afb0da39c0a55bdef4b093..c95a256695fc2e9591e512317d0f1c9ff15b30ec 100644 (file)
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -59,7 +59,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define CYAN   "\033[36m"
 
 /** The "scriptlet" setting */
-const struct setting scriptlet_setting __setting ( SETTING_MISC ) = {
+const struct setting scriptlet_setting __setting ( SETTING_MISC, scriptlet ) = {
        .name = "scriptlet",
        .description = "Boot scriptlet",
        .tag = DHCP_EB_SCRIPTLET,
@@ -119,7 +119,8 @@ static struct uri * parse_next_server_and_filename ( struct in_addr next_server,
 }
 
 /** The "keep-san" setting */
-const struct setting keep_san_setting __setting ( SETTING_SANBOOT_EXTRA ) = {
+const struct setting keep_san_setting __setting ( SETTING_SANBOOT_EXTRA,
+                                                 keep-san ) = {
        .name = "keep-san",
        .description = "Preserve SAN connection",
        .tag = DHCP_EB_KEEP_SAN,
@@ -127,7 +128,8 @@ const struct setting keep_san_setting __setting ( SETTING_SANBOOT_EXTRA ) = {
 };
 
 /** The "skip-san-boot" setting */
-const struct setting skip_san_boot_setting __setting ( SETTING_SANBOOT_EXTRA )={
+const struct setting skip_san_boot_setting __setting ( SETTING_SANBOOT_EXTRA,
+                                                      skip-san-boot ) = {
        .name = "skip-san-boot",
        .description = "Do not boot from SAN device",
        .tag = DHCP_EB_SKIP_SAN_BOOT,