lib: Move ipmi_bootdev enum to types.h

[petitboot] / discover / boot.c

diff --git a/discover/boot.c b/discover/boot.c
index e5803a76dcf0fbc228f2c426b19c415c28d382ef..7778b3fd02bc21f588e260e08cb888d20b4a266a 100644 (file)
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -18,6 +18,7 @@
 #include <talloc/talloc.h>
 #include <url/url.h>
 #include <util/util.h>
+#include <i18n/i18n.h>
 
 #include "device-handler.h"
 #include "boot.h"
@@ -176,7 +177,7 @@ static void boot_hook_update(struct boot_task *task, const char *hookname,
                char *buf)
 {
        char *line, *name, *val, *sep;
-       char *saveptr;
+       char *saveptr = NULL;
 
        for (;; buf = NULL) {
 
@@ -235,7 +236,7 @@ static void run_boot_hooks(struct boot_task *task)
                return;
 
        update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-                       "running boot hooks");
+                       _("running boot hooks"));
 
        boot_hook_setenv(task);
 
@@ -298,7 +299,7 @@ static int check_load(struct boot_task *task, const char *name,
 
        update_status(task->status_fn, task->status_arg,
                        BOOT_STATUS_ERROR,
-                       "Couldn't load %s", name);
+                       _("Couldn't load %s"), name);
        return -1;
 }
 
@@ -340,6 +341,11 @@ static void cleanup_cancellations(struct boot_task *task,
                } else if (result->status == LOAD_ASYNC) {
                        load_url_async_cancel(result);
                        pending = true;
+
+               /* if we're waiting for a cancellation, we still need to
+                * wait for the completion before freeing the boot task */
+               } else if (result->status == LOAD_CANCELLED) {
+                       pending = true;
                }
        }
 
@@ -376,12 +382,12 @@ static void boot_process(struct load_url_result *result, void *data)
        run_boot_hooks(task);
 
        update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-                       "performing kexec_load");
+                       _("performing kexec_load"));
 
        rc = kexec_load(task);
        if (rc) {
                update_status(task->status_fn, task->status_arg,
-                               BOOT_STATUS_ERROR, "kexec load failed");
+                               BOOT_STATUS_ERROR, _("kexec load failed"));
        }
 
 no_load:
@@ -392,13 +398,13 @@ no_load:
        if (!rc) {
                update_status(task->status_fn, task->status_arg,
                                BOOT_STATUS_INFO,
-                               "performing kexec reboot");
+                               _("performing kexec reboot"));
 
                rc = kexec_reboot(task);
                if (rc) {
                        update_status(task->status_fn, task->status_arg,
                                        BOOT_STATUS_ERROR,
-                                       "kexec reboot failed");
+                                       _("kexec reboot failed"));
                }
        }
 }
@@ -413,7 +419,7 @@ static int start_url_load(struct boot_task *task, const char *name,
        if (!*result) {
                update_status(task->status_fn, task->status_arg,
                                BOOT_STATUS_ERROR,
-                               "Error loading %s", name);
+                               _("Error loading %s"), name);
                return -1;
        }
        return 0;
@@ -433,10 +439,10 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
        else if (cmd && cmd->boot_image_file)
                boot_desc = cmd->boot_image_file;
        else
-               boot_desc = "(unknown)";
+               boot_desc = _("(unknown)");
 
        update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                       "Booting %s.", boot_desc);
+                       _("Booting %s."), boot_desc);
 
        if (cmd && cmd->boot_image_file) {
                image = pb_url_parse(opt, cmd->boot_image_file);
@@ -445,7 +451,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
        } else {
                pb_log("%s: no image specified\n", __func__);
                update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-                               "Boot failed: no image specified");
+                               _("Boot failed: no image specified"));
                return NULL;
        }
 
@@ -496,7 +502,7 @@ void boot_cancel(struct boot_task *task)
        task->cancelled = true;
 
        update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-                       "Boot cancelled");
+                       _("Boot cancelled"));
 
        cleanup_cancellations(task, NULL);
 }