lib/log: Switch to pb_log_fn

[petitboot] / discover / boot.c

diff --git a/discover/boot.c b/discover/boot.c
index 09e42f2c1b3fb0df7bd266a9b56c55f96f0fb4b2..7faec9fcf684027117283a4f9806f1db26be727b 100644 (file)
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -26,7 +26,7 @@
 #include "resource.h"
 #include "platform.h"
 
 #include "resource.h"
 #include "platform.h"
 

-#include <security/gpg.h>
+#include <security/security.h>

 
 static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d";
 enum {
 
 static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d";
 enum {


@@ -72,7 +72,7 @@ static int kexec_load(struct boot_task *boot_task)
        boot_task->local_dtb_override = NULL;
        boot_task->local_image_override = NULL;
 
        boot_task->local_dtb_override = NULL;
        boot_task->local_image_override = NULL;
 

-       if ((result = gpg_validate_boot_files(boot_task))) {
+       if ((result = validate_boot_files(boot_task))) {

                if (result == KEXEC_LOAD_DECRYPTION_FALURE) {
                        pb_log("%s: Aborting kexec due to"
                                " decryption failure\n", __func__);
                if (result == KEXEC_LOAD_DECRYPTION_FALURE) {
                        pb_log("%s: Aborting kexec due to"
                                " decryption failure\n", __func__);


@@ -94,7 +94,7 @@ static int kexec_load(struct boot_task *boot_task)
 
        process = process_create(boot_task);
        if (!process) {
 
        process = process_create(boot_task);
        if (!process) {

-               pb_log("%s: failed to create process\n", __func__);
+               pb_log_fn("failed to create process\n");

                return -1;
        }
 
                return -1;
        }
 


@@ -131,20 +131,20 @@ static int kexec_load(struct boot_task *boot_task)
 
        result = process_run_sync(process);
        if (result) {
 
        result = process_run_sync(process);
        if (result) {

-               pb_log("%s: failed to run process\n", __func__);
+               pb_log_fn("failed to run process\n");

                goto abort_kexec;
        }
 
        result = process->exit_status;
 
        if (result) {
                goto abort_kexec;
        }
 
        result = process->exit_status;
 
        if (result) {

-               pb_log("%s: failed: (%d)\n", __func__, result);
+               pb_log_fn("failed: (%d)\n", result);

                update_status(boot_task->status_fn, boot_task->status_arg,
                                STATUS_ERROR, "%s", process->stdout_buf);
        }
 
 abort_kexec:
                update_status(boot_task->status_fn, boot_task->status_arg,
                                STATUS_ERROR, "%s", process->stdout_buf);
        }
 
 abort_kexec:

-       gpg_validate_boot_files_cleanup(boot_task);
+       validate_boot_files_cleanup(boot_task);

 
        return result;
 }
 
        return result;
 }


@@ -170,7 +170,7 @@ static int kexec_reboot(struct boot_task *task)
        }
 
        if (result)
        }
 
        if (result)

-               pb_log("%s: failed: (%d)\n", __func__, result);
+               pb_log_fn("failed: (%d)\n", result);

 
        /* okay, kexec -e -f */
        if (result) {
 
        /* okay, kexec -e -f */
        if (result) {


@@ -179,7 +179,7 @@ static int kexec_reboot(struct boot_task *task)
        }
 
        if (result)
        }
 
        if (result)

-               pb_log("%s: failed: (%d)\n", __func__, result);
+               pb_log_fn("failed: (%d)\n", result);

 
 
        return result;
 
 
        return result;


@@ -341,6 +341,8 @@ static int check_load(struct boot_task *task, const char *name,
                return 0;
        }
 
                return 0;
        }
 

+       pb_log("Failed to load %s from %s\n", name,
+                       pb_url_to_string(result->url));

        update_status(task->status_fn, task->status_arg,
                        STATUS_ERROR,
                        _("Couldn't load %s from %s"), name,
        update_status(task->status_fn, task->status_arg,
                        STATUS_ERROR,
                        _("Couldn't load %s from %s"), name,


@@ -421,7 +423,7 @@ static void boot_process(struct load_url_result *result, void *data)
                        _("Performing kexec load"));
 
        rc = kexec_load(task);
                        _("Performing kexec load"));
 
        rc = kexec_load(task);

-       pb_log("%s: kexec_load returned %d\n", __func__, rc);
+       pb_log_fn("kexec_load returned %d\n", rc);

        if (rc == KEXEC_LOAD_DECRYPTION_FALURE) {
                update_status(task->status_fn, task->status_arg,
                                STATUS_ERROR, _("Decryption failed"));
        if (rc == KEXEC_LOAD_DECRYPTION_FALURE) {
                update_status(task->status_fn, task->status_arg,
                                STATUS_ERROR, _("Decryption failed"));


@@ -451,6 +453,8 @@ no_load:
                                        STATUS_ERROR,
                                        _("kexec reboot failed"));
                }
                                        STATUS_ERROR,
                                        _("kexec reboot failed"));
                }

+       } else {
+               pb_log("Failed to load all boot resources\n");

        }
 }
 
        }
 }
 


@@ -462,6 +466,8 @@ static int start_url_load(struct boot_task *task, struct boot_resource *res)
        res->result = load_url_async(task, res->url, boot_process,
                                 task, NULL, task->status_arg);
        if (!res->result) {
        res->result = load_url_async(task, res->url, boot_process,
                                 task, NULL, task->status_arg);
        if (!res->result) {

+               pb_log("Error starting load for %s at %s\n",
+                               res->name, pb_url_to_string(res->url));

                update_status(task->status_fn, task->status_arg,
                                STATUS_ERROR, _("Error loading %s"),
                                res->name);
                update_status(task->status_fn, task->status_arg,
                                STATUS_ERROR, _("Error loading %s"),
                                res->name);


@@ -520,7 +526,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
        } else if (opt && opt->boot_image) {
                image = opt->boot_image->url;
        } else {
        } else if (opt && opt->boot_image) {
                image = opt->boot_image->url;
        } else {

-               pb_log("%s: no image specified\n", __func__);
+               pb_log_fn("no image specified\n");

                update_status(status_fn, status_arg, STATUS_INFO,
                                _("Boot failed: no image specified"));
                return NULL;
                update_status(status_fn, status_arg, STATUS_INFO,
                                _("Boot failed: no image specified"));
                return NULL;


@@ -598,21 +604,21 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
        if (boot_task->verify_signature) {
                /* Generate names of associated signature files and load */
                if (image) {
        if (boot_task->verify_signature) {
                /* Generate names of associated signature files and load */
                if (image) {

-                       image_sig = gpg_get_signature_url(ctx, image);
+                       image_sig = get_signature_url(ctx, image);

                        tmp = add_boot_resource(boot_task,
                                        _("kernel image signature"), image_sig,
                                        &boot_task->local_image_signature);
                        rc |= start_url_load(boot_task, tmp);
                }
                if (initrd) {
                        tmp = add_boot_resource(boot_task,
                                        _("kernel image signature"), image_sig,
                                        &boot_task->local_image_signature);
                        rc |= start_url_load(boot_task, tmp);
                }
                if (initrd) {

-                       initrd_sig = gpg_get_signature_url(ctx, initrd);
+                       initrd_sig = get_signature_url(ctx, initrd);

                        tmp = add_boot_resource(boot_task,
                                        _("initrd signature"), initrd_sig,
                                        &boot_task->local_initrd_signature);
                        rc |= start_url_load(boot_task, tmp);
                }
                if (dtb) {
                        tmp = add_boot_resource(boot_task,
                                        _("initrd signature"), initrd_sig,
                                        &boot_task->local_initrd_signature);
                        rc |= start_url_load(boot_task, tmp);
                }
                if (dtb) {

-                       dtb_sig = gpg_get_signature_url(ctx, dtb);
+                       dtb_sig = get_signature_url(ctx, dtb);

                        tmp = add_boot_resource(boot_task,
                                        _("dtb signature"), dtb_sig,
                                        &boot_task->local_dtb_signature);
                        tmp = add_boot_resource(boot_task,
                                        _("dtb signature"), dtb_sig,
                                        &boot_task->local_dtb_signature);