X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=8200883a4a5d8ddd44bf593e6b60c0d24e441b00;hp=35008cc8c823afdf095fb2ffc319c0b828979b63;hb=0739476294f6925b01ad12b1b198f85b41bc657d;hpb=c14b12980885edd035322cd3bc87efff444c39b1

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 35008cc..8200883 100644
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -42,6 +42,7 @@ struct config *config_copy(void *ctx, const struct config *src)
 	dest = talloc(ctx, struct config);
 	dest->autoboot_enabled = src->autoboot_enabled;
 	dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
+	dest->safe_mode = src->safe_mode;
 
 	dest->network.n_interfaces = src->network.n_interfaces;
 	dest->network.interfaces = talloc_array(dest, struct interface_config *,
@@ -58,12 +59,30 @@ struct config *config_copy(void *ctx, const struct config *src)
 		dest->network.dns_servers[i] = talloc_strdup(dest,
 				src->network.dns_servers[i]);
 
-	dest->n_boot_priorities = src->n_boot_priorities;
-	dest->boot_priorities = talloc_array(dest, struct boot_priority,
-			src->n_boot_priorities);
+	dest->n_autoboot_opts = src->n_autoboot_opts;
+	dest->autoboot_opts = talloc_array(dest, struct autoboot_option,
+					dest->n_autoboot_opts);
+
+	for (i = 0; i < src->n_autoboot_opts; i++) {
+		dest->autoboot_opts[i].boot_type =
+			src->autoboot_opts[i].boot_type;
+		if (src->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+			dest->autoboot_opts[i].type =
+				src->autoboot_opts[i].type;
+		else
+			dest->autoboot_opts[i].uuid =
+				talloc_strdup(dest, src->autoboot_opts[i].uuid);
+	}
+
+	dest->ipmi_bootdev = src->ipmi_bootdev;
+	dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
+
+	dest->allow_writes = src->allow_writes;
 
-	for (i = 0; i < src->n_boot_priorities; i++)
-		dest->boot_priorities[i].type = src->boot_priorities[i].type;
+	if (src->lang && strlen(src->lang))
+		dest->lang = talloc_strdup(dest, src->lang);
+	else
+		dest->lang = NULL;
 
 	return dest;
 }