X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=28c081d7540332281e972609f935496141905a21;hp=1e7c8284eed3b5e1c2d0a431022b76d43b3fab15;hb=a1fb38f17bfa60aac89d0dd21dd8ccc739d794bf;hpb=30a68ef1ba00b24f50efef4f22c426396176462d

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 1e7c828..28c081d 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/fcntl.h>
@@ -343,8 +344,8 @@ static int parse_one_dns_config(struct config *config,
 static void populate_network_config(struct platform_powerpc *platform,
 		struct config *config)
 {
+	char *val, *saveptr = NULL;
 	const char *cval;
-	char *val;
 	int i;
 
 	cval = get_param(platform, "petitboot,network");
@@ -354,7 +355,7 @@ static void populate_network_config(struct platform_powerpc *platform,
 	val = talloc_strdup(config, cval);
 
 	for (i = 0; ; i++) {
-		char *tok, *saveptr;
+		char *tok;
 
 		tok = strtok_r(i == 0 ? val : NULL, " ", &saveptr);
 		if (!tok)
@@ -573,6 +574,46 @@ static int read_bootdev_sysparam(const char *name, uint8_t *val)
 	return 0;
 }
 
+static int write_bootdev_sysparam(const char *name, uint8_t val)
+{
+	char path[50];
+	int fd, rc;
+
+	strcpy(path, sysparams_dir);
+	assert(strlen(name) < sizeof(path) - strlen(path));
+	strcat(path, name);
+
+	fd = open(path, O_WRONLY);
+	if (fd < 0) {
+		pb_debug("powerpc: can't access sysparam %s for writing\n",
+				name);
+		return -1;
+	}
+
+	for (;;) {
+		errno = 0;
+		rc = write(fd, &val, sizeof(val));
+		if (rc == sizeof(val)) {
+			rc = 0;
+			break;
+		}
+
+		if (rc <= 0 && errno != EINTR) {
+			pb_log("powerpc: error updating sysparam %s: %s",
+					name, strerror(errno));
+			rc = -1;
+			break;
+		}
+	}
+
+	close(fd);
+
+	if (!rc)
+		pb_debug("powerpc: set sysparam %s: 0x%02x\n", name, val);
+
+	return rc;
+}
+
 static void parse_opal_sysparams(struct config *config)
 {
 	uint8_t next_bootdev, default_bootdev;
@@ -589,10 +630,12 @@ static void parse_opal_sysparams(struct config *config)
 	if (!next_valid && !default_valid)
 		return;
 
-	if (!next_valid)
+	if (next_valid) {
+		/* invalidate next-boot-device setting */
+		write_bootdev_sysparam("next-boot-device", 0xff);
+	} else {
 		next_bootdev = default_bootdev;
-
-	/* todo: copy default to next */
+	}
 
 	switch (next_bootdev) {
 	case IPMI_BOOTDEV_NONE: