summaryrefslogtreecommitdiffstats
path: root/src/net/tcp
diff options
context:
space:
mode:
authorMichael Brown2013-12-05 13:38:51 +0100
committerMichael Brown2013-12-05 13:43:28 +0100
commitb0942534eb773915d3cb4e3d63354e5fddf5c0c7 (patch)
treedaded81f513f3ef5fbe061d509f4a923beb7a762 /src/net/tcp
parent[dhcpv6] Use DUID-UUID form of client DUID (diff)
downloadipxe-b0942534eb773915d3cb4e3d63354e5fddf5c0c7.tar.gz
ipxe-b0942534eb773915d3cb4e3d63354e5fddf5c0c7.tar.xz
ipxe-b0942534eb773915d3cb4e3d63354e5fddf5c0c7.zip
[settings] Force settings into alphabetical order within sections
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net/tcp')
-rw-r--r--src/net/tcp/iscsi.c9
-rw-r--r--src/net/tcp/oncrpc.c4
-rw-r--r--src/net/tcp/syslogs.c2
3 files changed, 9 insertions, 6 deletions
diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index 197069cc..a6fcd251 100644
--- 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 0a3b3858..cd33ece0 100644
--- 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 5180e4da..095afc54 100644
--- 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,