X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=92c7e741578ca02675a98927cd4aff9faad88b47;hp=a2272f431e80d49d4ab829563db4716abfd78769;hb=1a72ffef7837cd2aa3e6be945ec03fb6b5caa51a;hpb=d3e95283e69d3099fe9f36e56be1f645f565c843

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index a2272f4..92c7e74 100644
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -10,7 +10,8 @@
 static struct interface_config *config_copy_interface(struct config *ctx,
 		struct interface_config *src)
 {
-	struct interface_config *dest = talloc(ctx, struct interface_config);
+	struct interface_config *dest = talloc_zero(ctx,
+						struct interface_config);
 
 	memcpy(dest->hwaddr, src->hwaddr, sizeof(src->hwaddr));
 	dest->ignore = src->ignore;
@@ -28,6 +29,8 @@ static struct interface_config *config_copy_interface(struct config *ctx,
 			talloc_strdup(dest, src->static_config.address);
 		dest->static_config.gateway =
 			talloc_strdup(dest, src->static_config.gateway);
+		dest->static_config.url =
+			talloc_strdup(dest, src->static_config.url);
 		break;
 	}
 
@@ -59,24 +62,26 @@ 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);
-	else
-		dest->boot_device = NULL;
-
 	dest->ipmi_bootdev = src->ipmi_bootdev;
 	dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
 
+	dest->allow_writes = src->allow_writes;
+
 	if (src->lang && strlen(src->lang))
 		dest->lang = talloc_strdup(dest, src->lang);
 	else