X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fpbt-client.c;h=39facf5fe73094b16dc8759086c43708daa2b6f3;hp=8eba0a23209246d8edb7b505c223d23ff6814d69;hb=6b842bb2559116a949c6a569ac39f5c56ebc1be1;hpb=6eb39a03bf66d91c37ca5d14dd61a90850a921d3 diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index 8eba0a2..39facf5 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -69,10 +69,10 @@ static int pbt_client_run_kexec(struct pbt_item *item) sleep(item->pbt_client->dry_run ? 1 : 60); } - pb_log("%s: failed: %s\n", __func__, opt_data->kd->image); + pb_log("%s: failed: %s\n", __func__, opt_data->bd->image); pbt_frame_status_printf(&item->pbt_client->frame, "Failed: kexec %s", - opt_data->kd->image); + opt_data->bd->image); return 0; } @@ -145,12 +145,12 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client) i->data = opt_data = talloc(i, struct pb_opt_data); opt_data->name = opt->name; - opt_data->kd = talloc(i, struct pb_kexec_data); - opt_data->kd->image = talloc_strdup(opt_data->kd, + opt_data->bd = talloc(i, struct pb_boot_data); + opt_data->bd->image = talloc_strdup(opt_data->bd, opt->boot_image_file); - opt_data->kd->initrd = talloc_strdup(opt_data->kd, + opt_data->bd->initrd = talloc_strdup(opt_data->bd, opt->initrd_file); - opt_data->kd->args = talloc_strdup(opt_data->kd, + opt_data->bd->args = talloc_strdup(opt_data->bd, opt->boot_args); opt_data->dev = dev; opt_data->opt = opt;