utils: Rename 30-dtb_updates to 30-dtb-updates

[petitboot] / lib / pb-config / pb-config.c

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 92c7e741578ca02675a98927cd4aff9faad88b47..2f9af286b770aec0e5083a1a92296fd642e27fe3 100644 (file)
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -33,6 +33,7 @@ static struct interface_config *config_copy_interface(struct config *ctx,
                        talloc_strdup(dest, src->static_config.url);
                break;
        }
+       dest->override = src->override;
 
        return dest;
 }
@@ -42,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;
@@ -82,6 +83,17 @@ struct config *config_copy(void *ctx, const struct config *src)
 
        dest->allow_writes = src->allow_writes;
 
+       dest->n_consoles = src->n_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,
+                                               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);
        else