From 662129afba2d344d692a9dbfd430c91eff4f281d Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Tue, 6 Sep 2016 13:30:30 +1000 Subject: discover: Avoid writing network overrides to NVRAM Explicitly keep track of whether the current interface config was set by an IPMI network override, and avoid overwriting any saved config unless the override was marked persistent. Signed-off-by: Samuel Mendoza-Jonas --- discover/platform-powerpc.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'discover/platform-powerpc.c') diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 8fca5bd..2b89121 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -635,6 +635,15 @@ static void update_network_config(struct platform_powerpc *platform, unsigned int i; char *val; + /* + * Don't store IPMI overrides to NVRAM. If this was a persistent + * override it was already stored in NVRAM by + * get_ipmi_network_override() + */ + if (config->network.n_interfaces && + config->network.interfaces[0]->override) + return; + val = talloc_strdup(platform, ""); for (i = 0; i < config->network.n_interfaces; i++) { -- cgit v1.2.1