discover/grub2: Add linux16 command

[petitboot] / ui / twin / main-generic.c

diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index c9cb4923863c06b96807514e1ab46eb709ae406d..649ad00121c800cb57a98d9c58ba71bbe760712f 100644 (file)
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -204,7 +204,7 @@ 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;
                }
@@ -212,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);
@@ -245,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;
@@ -273,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);
 
@@ -291,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");