X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=735cd989725ec07760fafcae6ccf9208d9632cba;hp=86f14c9082baddb9e7bce67fc62f764a76b34f4b;hb=HEAD;hpb=9f42e56fc5968fcb34edfad017adb73960c2bb61

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 86f14c9..735cd98 100644
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -43,6 +43,9 @@ struct config *config_copy(void *ctx, const struct config *src)
 	struct config *dest;
 	unsigned int i;
 
+	if (!src)
+		return NULL;
+
 	dest = talloc_zero(ctx, struct config);
 	dest->autoboot_enabled = src->autoboot_enabled;
 	dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
@@ -63,6 +66,9 @@ struct config *config_copy(void *ctx, const struct config *src)
 		dest->network.dns_servers[i] = talloc_strdup(dest,
 				src->network.dns_servers[i]);
 
+	dest->http_proxy = talloc_strdup(dest, src->http_proxy);
+	dest->https_proxy = talloc_strdup(dest, src->https_proxy);
+
 	dest->n_autoboot_opts = src->n_autoboot_opts;
 	dest->autoboot_opts = talloc_array(dest, struct autoboot_option,
 					dest->n_autoboot_opts);
@@ -80,18 +86,23 @@ struct config *config_copy(void *ctx, const struct config *src)
 
 	dest->ipmi_bootdev = src->ipmi_bootdev;
 	dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
+	dest->ipmi_bootdev_mailbox = src->ipmi_bootdev_mailbox;
 
 	dest->allow_writes = src->allow_writes;
 
 	dest->n_consoles = src->n_consoles;
-	if (src->consoles)
+	if (src->consoles) {
 		dest->consoles = talloc_array(dest, char *, src->n_consoles);
-	for (i = 0; i < src->n_consoles && src->n_consoles; i++)
-		dest->consoles[i] = talloc_strdup(dest->consoles,
+		for (i = 0; i < src->n_consoles && src->n_consoles; i++)
+			if (src->consoles[i])
+				dest->consoles[i] = talloc_strdup(
+						dest->consoles,
 						src->consoles[i]);
+	}
 
 	if (src->boot_console)
 		dest->boot_console = talloc_strdup(dest, src->boot_console);
+	dest->manual_console = src->manual_console;
 
 	if (src->lang && strlen(src->lang))
 		dest->lang = talloc_strdup(dest, src->lang);