X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Ftwin%2Fmain-generic.c;h=8ed46b72c41d113a120de88847e770321606cc95;hb=6eb39a03bf66d91c37ca5d14dd61a90850a921d3;hp=7cf510a44c2ebefebf485e3a6fb5f9f25bd5f158;hpb=09cc1ef3d7e2c1dab6648aceb24dd33e7897f998;p=petitboot diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c index 7cf510a..8ed46b7 100644 --- a/ui/twin/main-generic.c +++ b/ui/twin/main-generic.c @@ -199,7 +199,7 @@ fail_menu: return NULL; } -static int kexec_cb(__attribute__((unused)) struct pbt_client *client, struct pb_opt_data *opt_data) +static int kexec_cb(struct pbt_client *client, struct pb_opt_data *opt_data) { int result; @@ -207,7 +207,7 @@ static int kexec_cb(__attribute__((unused)) struct pbt_client *client, struct pb pb_log("%s: %s\n", __func__, opt_data->name); - result = pb_run_kexec(opt_data->kd); + result = pb_run_kexec(opt_data->kd, client->dry_run); return result; } @@ -215,7 +215,7 @@ static int kexec_cb(__attribute__((unused)) struct pbt_client *client, struct pb static int run(struct pbt_client *client) { while (1) { - int result = waiter_poll(); + int result = waiter_poll(client->waitset); if (result < 0 && errno != EINTR) { pb_log("%s: poll: %s\n", __func__, strerror(errno)); @@ -330,8 +330,8 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - client = pbt_client_init(opts.backend, 900, 300, kexec_cb, - opts.start_daemon); + client = pbt_client_init(opts.backend, 1024, 640, kexec_cb, + opts.start_daemon, opts.dry_run); if (!client) { ui_result = EXIT_FAILURE;