From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 23 Dec 2013 08:42:21 +0000 (+0800)
Subject: config/powerpc: Always call update_network_config
X-Git-Tag: v1.0.0~279
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=fafa0c268844aa3921f9df0ef72a1cb7c860793f

config/powerpc: Always call update_network_config

Currently, we have a bug when setting the default network configuration
(ie, no devices have any specific config), as we won't call
update_network_config to clear out the value of the petitboot,network
parameter.

This change always invokes update_network_config, regardless of the
number of interfaces configured. This ensures we clear out the
petitboot,network param, which is then synced to nvram if the param has
changed.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/lib/pb-config/storage-powerpc-nvram.c b/lib/pb-config/storage-powerpc-nvram.c
index 92305f9..42de598 100644
--- a/lib/pb-config/storage-powerpc-nvram.c
+++ b/lib/pb-config/storage-powerpc-nvram.c
@@ -481,8 +481,7 @@ static int update_config(struct powerpc_nvram_storage *nv,
 		talloc_free(val);
 	}
 
-	if (config->network.n_interfaces)
-		update_network_config(nv, config);
+	update_network_config(nv, config);
 
 	return write_nvram(nv);
 }