diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-09-06 13:30:30 +1000 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-09-08 14:26:27 +1000 |
| commit | 662129afba2d344d692a9dbfd430c91eff4f281d (patch) | |
| tree | 04a6ab48f0c0c575ee2a72b8b2958510a3750d2b /discover | |
| parent | 82b4c9d7ecbfada62295620a6082caf1b9860ff6 (diff) | |
| download | talos-petitboot-662129afba2d344d692a9dbfd430c91eff4f281d.tar.gz talos-petitboot-662129afba2d344d692a9dbfd430c91eff4f281d.zip | |
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 <sam@mendozajonas.com>
Diffstat (limited to 'discover')
| -rw-r--r-- | discover/ipmi.c | 1 | ||||
| -rw-r--r-- | discover/platform-powerpc.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/discover/ipmi.c b/discover/ipmi.c index 38423b2..2aaf114 100644 --- a/discover/ipmi.c +++ b/discover/ipmi.c @@ -309,6 +309,7 @@ int parse_ipmi_interface_override(struct config *config, uint8_t *buf, i += ipsize; } + ifconf->override = true; pb_log("Applying IPMI network interface override\n"); /* Replace any existing interface config */ 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++) { |
