X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fmain-generic.c;h=8ddec9ef2cd790044754196508114d08bf919e4b;hp=5020fa2f345ff8319a8805f07de400fc3b073379;hb=218b5233de442ce67784f9f5e3cd43b2b3f3306b;hpb=ae0ba68f475ae5b057aad6538765bc8702134b9a

diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index 5020fa2..8ddec9e 100644
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <errno.h>
 #include <getopt.h>
@@ -58,7 +57,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;
 }
@@ -71,7 +70,7 @@ static struct pbt_item *setup_system_item(struct pbt_menu *menu,
 	struct pbt_quad q;
 
 	top_item = pbt_item_create_reduced(menu, "system", 0,
-		PB_ARTWORK_PATH "/system.png");
+		PB_ARTWORK_PATH "/applications-system.png");
 
 	if (!top_item)
 		goto fail_top_item_create;
@@ -90,7 +89,7 @@ static struct pbt_item *setup_system_item(struct pbt_menu *menu,
 		goto fail_sub_menu_create;
 
 	sub_item = pbt_item_create(top_item->sub_menu, "Preferences", 0,
-		PB_ARTWORK_PATH "/system.png", "Preferences",
+		PB_ARTWORK_PATH "/configure.png", "Preferences",
 		"Edit petitboot preferences");
 
 	if (!sub_item)
@@ -101,7 +100,7 @@ static struct pbt_item *setup_system_item(struct pbt_menu *menu,
 	pbt_menu_set_selected(top_item->sub_menu, sub_item);
 
 	sub_item = pbt_item_create(top_item->sub_menu, "Exit to Shell", 1,
-		PB_ARTWORK_PATH "/system.png", "Exit to Shell",
+		PB_ARTWORK_PATH "/utilities-terminal.png", "Exit to Shell",
 		"Exit to a system shell prompt");
 
 	if (!sub_item)
@@ -199,25 +198,12 @@ fail_menu:
 	return NULL;
 }
 
-static int kexec_cb(__attribute__((unused)) 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->kd);
-
-	return result;
-}
-
 static int run(struct pbt_client *client)
 {
 	while (1) {
-		int result = waiter_poll();
+		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 +211,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 +242,6 @@ static void sig_handler(int signum)
 		return;
 
 	switch (signum) {
-	case SIGALRM:
-		ui_timer_sigalrm(&sd->timer);
-		break;
 	case SIGWINCH:
 		sd->resize = 1;
 		break;
@@ -285,8 +266,8 @@ int main(int argc, char *argv[])
 	static struct pbt_opts opts;
 	int result;
 	int ui_result;
-	FILE *log;
 	struct pbt_client *client;
+	FILE *log;
 
 	result = pbt_opts_parse(&opts, argc, argv);
 
@@ -305,13 +286,13 @@ int main(int argc, char *argv[])
 		return EXIT_SUCCESS;
 	}
 
-	log = fopen(opts.log_file, "a");
-	assert(log);
-	pb_log_set_stream(log);
-
-#if defined(DEBUG)
-	pb_log_always_flush(1);
-#endif
+	log = stderr;
+	if (strcmp(opts.log_file, "-")) {
+		FILE *log = fopen(opts.log_file, "a");
+		if (!log)
+			log = stderr;
+	}
+	pb_log_init(log);
 
 	pb_log("--- petitboot-twin ---\n");
 
@@ -327,7 +308,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	client = pbt_client_init(opts.backend, 900, 300, kexec_cb);
+	client = pbt_client_init(opts.backend, 1024, 640, opts.start_daemon);
 
 	if (!client) {
 		ui_result = EXIT_FAILURE;