#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 {
struct process *process;
char *s_initrd = NULL;
char *s_args = NULL;
- const char *argv[7];
+ const char *argv[8];
char *s_dtb = NULL;
const char **p;
int result;
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__);
- goto abort_kexec;
}
if (result == KEXEC_LOAD_SIGNATURE_FAILURE) {
pb_log("%s: Aborting kexec due to signature"
" verification failure\n", __func__);
- goto abort_kexec;
}
+
+ goto abort_kexec;
}
const char* local_initrd = (boot_task->local_initrd_override) ?
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;
}
*p++ = pb_system_apps.kexec; /* 1 */
*p++ = "-l"; /* 2 */
+ if (pb_log_get_debug()) {
+ *p++ = "--debug"; /* 3 */
+ }
+
if (local_initrd) {
s_initrd = talloc_asprintf(boot_task, "--initrd=%s",
local_initrd);
assert(s_initrd);
- *p++ = s_initrd; /* 3 */
+ *p++ = s_initrd; /* 4 */
}
if (local_dtb) {
s_dtb = talloc_asprintf(boot_task, "--dtb=%s",
local_dtb);
assert(s_dtb);
- *p++ = s_dtb; /* 4 */
+ *p++ = s_dtb; /* 5 */
}
s_args = talloc_asprintf(boot_task, "--append=%s",
boot_task->args ?: "\"\"");
assert(s_args);
- *p++ = s_args; /* 5 */
+ *p++ = s_args; /* 6 */
- *p++ = local_image; /* 6 */
- *p++ = NULL; /* 7 */
+ *p++ = local_image; /* 7 */
+ *p++ = NULL; /* 8 */
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);
}
abort_kexec:
- gpg_validate_boot_files_cleanup(boot_task);
+ validate_boot_files_cleanup(boot_task);
return result;
}
}
if (result)
- pb_log("%s: failed: (%d)\n", __func__, result);
+ pb_log_fn("failed: (%d)\n", result);
/* okay, kexec -e -f */
if (result) {
}
if (result)
- pb_log("%s: failed: (%d)\n", __func__, result);
+ pb_log_fn("failed: (%d)\n", result);
return result;
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,
_("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"));
STATUS_ERROR,
_("kexec reboot failed"));
}
+ } else {
+ pb_log("Failed to load all boot resources\n");
}
}
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);
} 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;
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) {
- 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) {
- 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);