X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=98a6078bc552bb19f6a95d841ba2dd13024807f2;hb=a7307c0962b4de0e6459ea449939b79dfe1705cd;hp=2adc7b248d8b956569ff971464cf6e2bc74092e4;hpb=e19c5fe83174de749843bb8486a0d12c25adcb82;p=petitboot

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 2adc7b2..98a6078 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,20 +59,28 @@ 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);
-
-	for (i = 0; i < src->n_boot_priorities; i++) {
-		dest->boot_priorities[i].priority =
-					src->boot_priorities[i].priority;
-		dest->boot_priorities[i].type = src->boot_priorities[i].type;
+	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);
 	}
 
-	if (src->boot_device && strlen(src->boot_device))
-		dest->boot_device = talloc_strdup(dest, src->boot_device);
+	dest->ipmi_bootdev = src->ipmi_bootdev;
+	dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
+
+	if (src->lang && strlen(src->lang))
+		dest->lang = talloc_strdup(dest, src->lang);
 	else
-		dest->boot_device = NULL;
+		dest->lang = NULL;
 
 	return dest;
 }