X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpb-config%2Fpb-config.c;h=581d70f08cb8f65a4c680e77e7512366fc640e7a;hb=662129afba2d344d692a9dbfd430c91eff4f281d;hp=8200883a4a5d8ddd44bf593e6b60c0d24e441b00;hpb=acc5ace6e58db2f3dceb1f7a27d0fc1fb29c4a27;p=petitboot

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 8200883..581d70f 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,8 +29,11 @@ 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;
 	}
+	dest->override = src->override;
 
 	return dest;
 }
@@ -39,7 +43,7 @@ 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;
@@ -79,6 +83,16 @@ struct config *config_copy(void *ctx, const struct config *src)
 
 	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