From: Jeremy Kerr <jk@ozlabs.org>
Date: Thu, 23 Jan 2014 05:31:56 +0000 (+0800)
Subject: pb-config/powerpc: fix default option handling
X-Git-Tag: v1.0.0~258
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=e61e64c785de0809fb69cd160e8317f2de25793e;hp=f66b0807cace1cfda192810861ba6309bf6fa9fe

pb-config/powerpc: fix default option handling

Currently, we don't update nvram if an NVRAM parameter is set to the
default. This means we can never revert a configuration to its default
value.

This change fixes the default setting behaviour; instead of checking for
a default, we want to check if it's a default and the option is absent.

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 4b4b878..e371976 100644
--- a/lib/pb-config/storage-powerpc-nvram.c
+++ b/lib/pb-config/storage-powerpc-nvram.c
@@ -434,6 +434,20 @@ static char *dns_config_str(void *ctx, const char **dns_servers, int n)
 	return str;
 }
 
+static void update_string_config(struct powerpc_nvram_storage *nv,
+		const char *name, const char *value)
+{
+	const char *cur;
+
+	cur = get_param(nv, name);
+
+	/* don't set an empty parameter if it doesn't already exist */
+	if (!cur && !strlen(value))
+		return;
+
+	set_param(nv, name, value);
+}
+
 static void update_network_config(struct powerpc_nvram_storage *nv,
 	struct config *config)
 {
@@ -458,7 +472,7 @@ static void update_network_config(struct powerpc_nvram_storage *nv,
 		talloc_free(dns_str);
 	}
 
-	set_param(nv, "petitboot,network", val);
+	update_string_config(nv, "petitboot,network", val);
 
 	talloc_free(val);
 }
@@ -466,18 +480,24 @@ static void update_network_config(struct powerpc_nvram_storage *nv,
 static int update_config(struct powerpc_nvram_storage *nv,
 		struct config *config, struct config *defaults)
 {
-	char *val;
+	char *tmp = NULL;
+	const char *val;
 
-	if (config->autoboot_enabled != defaults->autoboot_enabled) {
+	if (config->autoboot_enabled == defaults->autoboot_enabled)
+		val = "";
+	else
 		val = config->autoboot_enabled ? "true" : "false";
-		set_param(nv, "auto-boot?", val);
-	}
+	update_string_config(nv, "auto-boot?", val);
 
-	if (config->autoboot_timeout_sec != defaults->autoboot_timeout_sec) {
-		val = talloc_asprintf(nv, "%d", config->autoboot_timeout_sec);
-		set_param(nv, "petitboot,timeout", val);
-		talloc_free(val);
-	}
+	if (config->autoboot_timeout_sec == defaults->autoboot_timeout_sec)
+		val = "";
+	else
+		val = tmp = talloc_asprintf(nv, "%d",
+				config->autoboot_timeout_sec);
+
+	update_string_config(nv, "petitboot,timeout", val);
+	if (tmp)
+		talloc_free(tmp);
 
 	update_network_config(nv, config);