X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=52a43b1607dc8bbf1410569474b1bd9c786bf8d6;hp=2adc7b248d8b956569ff971464cf6e2bc74092e4;hb=d19b94a83870f7b2a41e55d7462bcf36d2b5ba0b;hpb=e19c5fe83174de749843bb8486a0d12c25adcb82

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 2adc7b2..52a43b1 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;
 	}
 
@@ -39,9 +42,10 @@ struct config *config_copy(void *ctx, const struct config *src)
 	struct config *dest;
 	unsigned int i;
 
-	dest = talloc(ctx, struct config);
+	dest = talloc_zero(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 +62,40 @@ 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;
+
+	dest->allow_writes = src->allow_writes;
+
+	dest->n_tty = src->n_tty;
+	if (src->tty_list)
+		dest->tty_list = talloc_array(dest, char *, src->n_tty);
+	for (i = 0; i < src->n_tty && src->n_tty; i++)
+		dest->tty_list[i] = talloc_strdup(dest->tty_list,
+						src->tty_list[i]);
+
+	if (src->boot_tty)
+		dest->boot_tty = talloc_strdup(dest, src->boot_tty);
+
+	if (src->lang && strlen(src->lang))
+		dest->lang = talloc_strdup(dest, src->lang);
 	else
-		dest->boot_device = NULL;
+		dest->lang = NULL;
 
 	return dest;
 }