X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=2f9af286b770aec0e5083a1a92296fd642e27fe3;hp=d43a5abba718bd1eedab88149b4d4aeaf6063589;hb=d9e70bb63227a683f808a21be20b3d5e1a474f95;hpb=d2b12ddb905a74fa6b2e454142b0b9f71fd99398 diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index d43a5ab..2f9af28 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; @@ -59,20 +63,41 @@ 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_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 - dest->boot_device = NULL; + dest->lang = NULL; return dest; }