X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fmain-generic.c;h=517422e4da9285ded2c1dfb8ec5d1d593bfd149a;hp=91a525b9f82cf9106b5f04b3b9f315d5f4e63ccd;hb=b8122dc9340e2f208220f0c88b4d71f91b78774f;hpb=22f215ac671e2cf9a7fa0f5f98ff5334713c6b24;ds=sidebyside

diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index 91a525b..517422e 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(struct pbt_client *client, struct pb_opt_data *opt_data)
+static int boot_cb(struct pbt_client *client, struct pb_opt_data *opt_data)
 {
 	int result;
 
@@ -207,7 +207,7 @@ static int kexec_cb(struct pbt_client *client, struct pb_opt_data *opt_data)
 
 	pb_log("%s: %s\n", __func__, opt_data->name);
 
-	result = pb_run_kexec(opt_data->kd, client->dry_run);
+	result = pb_boot(opt_data->bd, client->dry_run);
 
 	return result;
 }
@@ -215,7 +215,7 @@ static int kexec_cb(struct pbt_client *client, struct pb_opt_data *opt_data)
 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,7 +330,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	client = pbt_client_init(opts.backend, 1024, 640, kexec_cb,
+	client = pbt_client_init(opts.backend, 1024, 640, boot_cb,
 		opts.start_daemon, opts.dry_run);
 
 	if (!client) {