X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=8200883a4a5d8ddd44bf593e6b60c0d24e441b00;hb=d531395a3ff60730238854b127925978f6eab289;hp=d43a5abba718bd1eedab88149b4d4aeaf6063589;hpb=d2b12ddb905a74fa6b2e454142b0b9f71fd99398;p=petitboot diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index d43a5ab..8200883 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -59,20 +59,30 @@ 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; + + if (src->lang && strlen(src->lang)) + dest->lang = talloc_strdup(dest, src->lang); else - dest->boot_device = NULL; + dest->lang = NULL; return dest; }