summaryrefslogtreecommitdiffstats
path: root/discover
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2018-08-02 17:29:38 +0000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-07 11:30:36 +1000
commite4e0bfd13106a562c4ef5be1c3129ccf6bb97bd0 (patch)
treefabd8b80a4e5fd1ecdad86f63de2dfa34d86cf42 /discover
parentb5ab295d9cbddd1570d05471528f4d2ad7abae07 (diff)
downloadtalos-petitboot-e4e0bfd13106a562c4ef5be1c3129ccf6bb97bd0.tar.gz
talos-petitboot-e4e0bfd13106a562c4ef5be1c3129ccf6bb97bd0.zip
discover/powerpc: Add param_name arg
Update update_network_config and update_bootdev_config to operate on a generic parameter name passed as an argument. Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover')
-rw-r--r--discover/platform-powerpc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index c7432fb..87ff72e 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -609,7 +609,7 @@ static void update_string_config(struct platform_powerpc *platform,
}
static void update_network_config(struct platform_powerpc *platform,
- struct config *config)
+ const char *param_name, const struct config *config)
{
unsigned int i;
char *val;
@@ -642,13 +642,13 @@ static void update_network_config(struct platform_powerpc *platform,
talloc_free(dns_str);
}
- update_string_config(platform, "petitboot,network", val);
+ update_string_config(platform, param_name, val);
talloc_free(val);
}
static void update_bootdev_config(struct platform_powerpc *platform,
- struct config *config)
+ const char *param_name, const struct config *config)
{
char *val = NULL, *boot_str = NULL, *tmp = NULL;
struct autoboot_option *opt;
@@ -674,7 +674,7 @@ static void update_bootdev_config(struct platform_powerpc *platform,
tmp = val = talloc_asprintf_append(val, "%s", boot_str);
}
- update_string_config(platform, "petitboot,bootdevs", val);
+ update_string_config(platform, param_name, val);
talloc_free(tmp);
if (boot_str)
talloc_free(boot_str);
@@ -721,9 +721,9 @@ static void update_config(struct platform_powerpc *platform,
val = config->https_proxy ?: "";
update_string_config(platform, "petitboot,https_proxy", val);
- update_network_config(platform, config);
+ update_network_config(platform, "petitboot,network", config);
- update_bootdev_config(platform, config);
+ update_bootdev_config(platform, "petitboot,bootdevs", config);
}
static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
@@ -1071,7 +1071,7 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
if (!rc && persistent) {
/* Write this new config to NVRAM */
- update_network_config(platform, config);
+ update_network_config(platform, "petitboot,network", config);
rc = write_nvram(platform);
if (rc)
pb_log("platform: Failed to save persistent interface override\n");
OpenPOWER on IntegriCloud