X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fmain-generic.c;h=2301e31c3cbaa6dfe4201ca33d932858563f0480;hp=28a96e461f1223b1db244578c25790b37844591e;hb=4a2dbb71fdcf234302760d20333420a6e6566d56;hpb=6b842bb2559116a949c6a569ac39f5c56ebc1be1

diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index 28a96e4..2301e31 100644
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -58,7 +58,7 @@ static int edit_preferences_cb(struct pbt_item *item)
 
 	(void)client;
 
-	pb_log("%s: TODO\n", __func__);
+	pb_debug("%s: TODO\n", __func__);
 
 	return 0;
 }
@@ -199,25 +199,12 @@ fail_menu:
 	return NULL;
 }
 
-static int kexec_cb(struct pbt_client *client, struct pb_opt_data *opt_data)
-{
-	int result;
-
-	assert(opt_data);
-
-	pb_log("%s: %s\n", __func__, opt_data->name);
-
-	result = pb_run_kexec(opt_data->bd, client->dry_run);
-
-	return result;
-}
-
 static int run(struct pbt_client *client)
 {
 	while (1) {
 		int result = waiter_poll(client->waitset);
 
-		if (result < 0 && errno != EINTR) {
+		if (result < 0) {
 			pb_log("%s: poll: %s\n", __func__, strerror(errno));
 			break;
 		}
@@ -225,8 +212,6 @@ static int run(struct pbt_client *client)
 		if (client->signal_data.abort)
 			break;
 
-		ui_timer_process_sig(&client->signal_data.timer);
-
 		while (client->signal_data.resize) {
 			client->signal_data.resize = 0;
 			pbt_client_resize(client);
@@ -258,9 +243,6 @@ static void sig_handler(int signum)
 		return;
 
 	switch (signum) {
-	case SIGALRM:
-		ui_timer_sigalrm(&sd->timer);
-		break;
 	case SIGWINCH:
 		sd->resize = 1;
 		break;
@@ -286,6 +268,7 @@ int main(int argc, char *argv[])
 	int result;
 	int ui_result;
 	struct pbt_client *client;
+	FILE *log;
 
 	result = pbt_opts_parse(&opts, argc, argv);
 
@@ -304,17 +287,13 @@ int main(int argc, char *argv[])
 		return EXIT_SUCCESS;
 	}
 
+	log = stderr;
 	if (strcmp(opts.log_file, "-")) {
 		FILE *log = fopen(opts.log_file, "a");
-
-		assert(log);
-		pb_log_set_stream(log);
-	} else
-		pb_log_set_stream(stderr);
-
-#if defined(DEBUG)
-	pb_log_always_flush(1);
-#endif
+		if (!log)
+			log = stderr;
+	}
+	pb_log_init(log);
 
 	pb_log("--- petitboot-twin ---\n");
 
@@ -330,8 +309,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	client = pbt_client_init(opts.backend, 1024, 640, kexec_cb,
-		opts.start_daemon, opts.dry_run);
+	client = pbt_client_init(opts.backend, 1024, 640, opts.start_daemon);
 
 	if (!client) {
 		ui_result = EXIT_FAILURE;