summaryrefslogtreecommitdiffstats
path: root/discover/boot.c
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2018-08-02 17:29:34 +0000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-07 11:30:36 +1000
commitc78f9ec47ba92b74698dacdae963dbbefd9b676f (patch)
tree58ce2f0f50f8edb451f81d9ecedc9abc842bc3d6 /discover/boot.c
parent679d9dceb5bdf51f118548ca2645dc81088a8974 (diff)
downloadtalos-petitboot-c78f9ec47ba92b74698dacdae963dbbefd9b676f.tar.gz
talos-petitboot-c78f9ec47ba92b74698dacdae963dbbefd9b676f.zip
lib/log: Switch to pb_log_fn
The only functional change should be an additional '/n' to a few log messagees that seemed to be missing it. Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover/boot.c')
-rw-r--r--discover/boot.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/discover/boot.c b/discover/boot.c
index 04c32a1..7faec9f 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -94,7 +94,7 @@ static int kexec_load(struct boot_task *boot_task)
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;
}
@@ -131,14 +131,14 @@ static int kexec_load(struct boot_task *boot_task)
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) {
- 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);
}
@@ -170,7 +170,7 @@ static int kexec_reboot(struct boot_task *task)
}
if (result)
- pb_log("%s: failed: (%d)\n", __func__, result);
+ pb_log_fn("failed: (%d)\n", result);
/* okay, kexec -e -f */
if (result) {
@@ -179,7 +179,7 @@ static int kexec_reboot(struct boot_task *task)
}
if (result)
- pb_log("%s: failed: (%d)\n", __func__, result);
+ pb_log_fn("failed: (%d)\n", result);
return result;
@@ -423,7 +423,7 @@ static void boot_process(struct load_url_result *result, void *data)
_("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"));
@@ -526,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 {
- 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;
OpenPOWER on IntegriCloud