X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=1e010ab1ebc316e6a13a0ef588abe4ff9ed9330d;hp=c4ddfef591ebf5c76bf483ac0d5fa2fd13c9dc15;hb=d63bacef37d61b46e8db10914d4a7a677ba0775a;hpb=86c9d34380b0074dab1ba89a569a94280d6999c4

diff --git a/discover/boot.c b/discover/boot.c
index c4ddfef..1e010ab 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -34,26 +34,53 @@ enum {
 	BOOT_HOOK_EXIT_UPDATE	= 2,
 };
 
+static void __attribute__((format(__printf__, 4, 5))) update_status(
+		boot_status_fn fn, void *arg, int type, char *fmt, ...)
+{
+	struct status status;
+	va_list ap;
+
+	va_start(ap, fmt);
+	status.message = talloc_vasprintf(NULL, fmt, ap);
+	va_end(ap);
+
+	status.type = type;
+	status.backlog = false;
+
+	pb_debug("boot status: [%d] %s\n", type, status.message);
+
+	fn(arg, &status);
+
+	talloc_free(status.message);
+}
+
 /**
  * kexec_load - kexec load helper.
  */
 static int kexec_load(struct boot_task *boot_task)
 {
-	int result;
-	const char *argv[7];
-	const char **p;
+	struct process *process;
 	char *s_initrd = NULL;
-	char *s_dtb = NULL;
 	char *s_args = NULL;
+	const char *argv[7];
+	char *s_dtb = NULL;
+	const char **p;
+	int result;
+
 
 	boot_task->local_initrd_override = NULL;
 	boot_task->local_dtb_override = NULL;
 	boot_task->local_image_override = NULL;
 
 	if ((result = gpg_validate_boot_files(boot_task))) {
-		if (result == KEXEC_LOAD_SIGNATURE_FAILURE) {
+		if (result == KEXEC_LOAD_DECRYPTION_FALURE) {
 			pb_log("%s: Aborting kexec due to"
-				" signature verification failure\n", __func__);
+				" 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;
 		}
 	}
@@ -65,6 +92,17 @@ static int kexec_load(struct boot_task *boot_task)
 	const char* local_image = (boot_task->local_image_override) ?
 		boot_task->local_image_override : boot_task->local_image;
 
+	process = process_create(boot_task);
+	if (!process) {
+		pb_log("%s: failed to create process\n", __func__);
+		return -1;
+	}
+
+	process->path = pb_system_apps.kexec;
+	process->argv = argv;
+	process->keep_stdout = true;
+	process->add_stderr = true;
+
 	p = argv;
 	*p++ = pb_system_apps.kexec;	/* 1 */
 	*p++ = "-l";			/* 2 */
@@ -91,10 +129,19 @@ static int kexec_load(struct boot_task *boot_task)
 	*p++ = local_image;		/* 6 */
 	*p++ = NULL;			/* 7 */
 
-	result = process_run_simple_argv(boot_task, argv);
+	result = process_run_sync(process);
+	if (result) {
+		pb_log("%s: failed to run process\n", __func__);
+		goto abort_kexec;
+	}
+
+	result = process->exit_status;
 
-	if (result)
+	if (result) {
 		pb_log("%s: failed: (%d)\n", __func__, 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);
@@ -138,27 +185,6 @@ static int kexec_reboot(struct boot_task *task)
 	return result;
 }
 
-static void __attribute__((format(__printf__, 4, 5))) update_status(
-		boot_status_fn fn, void *arg, int type, char *fmt, ...)
-{
-	struct boot_status status;
-	va_list ap;
-
-	va_start(ap, fmt);
-	status.message = talloc_vasprintf(NULL, fmt, ap);
-	va_end(ap);
-
-	status.type = type;
-	status.progress = -1;
-	status.detail = NULL;
-
-	pb_debug("boot status: [%d] %s\n", type, status.message);
-
-	fn(arg, &status);
-
-	talloc_free(status.message);
-}
-
 static void boot_hook_update_param(void *ctx, struct boot_task *task,
 		const char *name, const char *value)
 {
@@ -215,7 +241,7 @@ static void boot_hook_setenv(struct boot_task *task)
 	unsetenv("boot_initrd");
 	unsetenv("boot_dtb");
 	unsetenv("boot_args");
-	unsetenv("boot_tty");
+	unsetenv("boot_console");
 
 	setenv("boot_image", task->local_image, 1);
 	if (task->local_initrd)
@@ -224,8 +250,8 @@ static void boot_hook_setenv(struct boot_task *task)
 		setenv("boot_dtb", task->local_dtb, 1);
 	if (task->args)
 		setenv("boot_args", task->args, 1);
-	if (task->boot_tty)
-		setenv("boot_tty", task->boot_tty, 1);
+	if (task->boot_console)
+		setenv("boot_console", task->boot_console, 1);
 }
 
 static int hook_filter(const struct dirent *dirent)
@@ -247,8 +273,8 @@ static void run_boot_hooks(struct boot_task *task)
 	if (n < 1)
 		return;
 
-	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-			_("running boot hooks"));
+	update_status(task->status_fn, task->status_arg, STATUS_INFO,
+			_("Running boot hooks"));
 
 	boot_hook_setenv(task);
 
@@ -298,7 +324,7 @@ static void run_boot_hooks(struct boot_task *task)
 
 static bool load_pending(struct load_url_result *result)
 {
-	return result && result->status == LOAD_ASYNC;
+	return !result || result->status == LOAD_ASYNC;
 }
 
 static int check_load(struct boot_task *task, const char *name,
@@ -306,12 +332,19 @@ static int check_load(struct boot_task *task, const char *name,
 {
 	if (!result)
 		return 0;
-	if (result->status != LOAD_ERROR)
+
+	if (result->status != LOAD_ERROR) {
+		update_status(task->status_fn, task->status_arg,
+				STATUS_ERROR,
+				_("Loaded %s from %s"), name,
+				pb_url_to_string(result->url));
 		return 0;
+	}
 
 	update_status(task->status_fn, task->status_arg,
-			BOOT_STATUS_ERROR,
-			_("Couldn't load %s"), name);
+			STATUS_ERROR,
+			_("Couldn't load %s from %s"), name,
+			pb_url_to_string(result->url));
 	return -1;
 }
 
@@ -368,6 +401,7 @@ static void cleanup_cancellations(struct boot_task *task,
 static void boot_process(struct load_url_result *result, void *data)
 {
 	struct boot_task *task = data;
+	struct boot_resource *resource;
 	int rc = -1;
 
 	if (task->cancelled) {
@@ -375,114 +409,92 @@ static void boot_process(struct load_url_result *result, void *data)
 		return;
 	}
 
-	if (load_pending(task->image) ||
-			load_pending(task->initrd) ||
-			load_pending(task->dtb))
-		return;
-
-	if (check_load(task, "kernel image", task->image) ||
-			check_load(task, "initrd", task->initrd) ||
-			check_load(task, "dtb", task->dtb))
-		goto no_load;
-
-	if (task->verify_signature) {
-		if (load_pending(task->image_signature) ||
-				load_pending(task->initrd_signature) ||
-				load_pending(task->dtb_signature) ||
-				load_pending(task->cmdline_signature))
+	list_for_each_entry(&task->resources, resource, list)
+		if (load_pending(resource->result))
 			return;
 
-		if (check_load(task, "kernel image signature",
-					task->image_signature) ||
-				check_load(task, "initrd signature",
-					task->initrd_signature) ||
-				check_load(task, "dtb signature",
-					task->dtb_signature) ||
-				check_load(task, "command line signature",
-					task->cmdline_signature))
-			goto no_sig_load;
-	}
-
-	/* we make a copy of the local paths, as the boot hooks might update
-	 * and/or create these */
-	task->local_image = task->image ? task->image->local : NULL;
-	task->local_initrd = task->initrd ? task->initrd->local : NULL;
-	task->local_dtb = task->dtb ? task->dtb->local : NULL;
-
-	if (task->verify_signature) {
-		task->local_image_signature = task->image_signature ?
-			task->image_signature->local : NULL;
-		task->local_initrd_signature = task->initrd_signature ?
-			task->initrd_signature->local : NULL;
-		task->local_dtb_signature = task->dtb_signature ?
-			task->dtb_signature->local : NULL;
-		task->local_cmdline_signature = task->cmdline_signature ?
-			task->cmdline_signature->local : NULL;
+	list_for_each_entry(&task->resources, resource, list) {
+		if (check_load(task, resource->name, resource->result))
+			goto no_load;
+		*resource->local_path = resource->result->local;
 	}
 
 	run_boot_hooks(task);
 
-	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-			_("performing kexec_load"));
+	update_status(task->status_fn, task->status_arg, STATUS_INFO,
+			_("Performing kexec load"));
 
 	rc = kexec_load(task);
-	if (rc == KEXEC_LOAD_SIGNATURE_FAILURE) {
+	pb_log("%s: kexec_load returned %d\n", __func__, rc);
+	if (rc == KEXEC_LOAD_DECRYPTION_FALURE) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("signature verification failed"));
+				STATUS_ERROR, _("Decryption failed"));
 	}
-	else if (rc == KEXEC_LOAD_SIG_SETUP_INVALID) {
+	else if (rc == KEXEC_LOAD_SIGNATURE_FAILURE) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("invalid signature configuration"));
+				STATUS_ERROR,
+				_("Signature verification failed"));
 	}
-	else if (rc) {
+	else if (rc == KEXEC_LOAD_SIG_SETUP_INVALID) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("kexec load failed"));
+				STATUS_ERROR,
+				_("Invalid signature configuration"));
 	}
 
-no_sig_load:
-	cleanup_load(task->image_signature);
-	cleanup_load(task->initrd_signature);
-	cleanup_load(task->dtb_signature);
-	cleanup_load(task->cmdline_signature);
-
 no_load:
-	cleanup_load(task->image);
-	cleanup_load(task->initrd);
-	cleanup_load(task->dtb);
+	list_for_each_entry(&task->resources, resource, list)
+		cleanup_load(resource->result);
 
 	if (!rc) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_INFO,
-				_("performing kexec reboot"));
+				STATUS_INFO, _("Performing kexec reboot"));
 
 		rc = kexec_reboot(task);
 		if (rc) {
 			update_status(task->status_fn, task->status_arg,
-					BOOT_STATUS_ERROR,
+					STATUS_ERROR,
 					_("kexec reboot failed"));
 		}
 	}
 }
 
-static int start_url_load(struct boot_task *task, const char *name,
-		struct pb_url *url, struct load_url_result **result)
+static int start_url_load(struct boot_task *task, struct boot_resource *res)
 {
-	if (!url)
+	if (!res)
 		return 0;
 
-	*result = load_url_async(task, url, boot_process, task);
-	if (!*result) {
+	res->result = load_url_async(task, res->url, boot_process,
+				 task, NULL, task->status_arg);
+	if (!res->result) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("Error loading %s"), name);
+				STATUS_ERROR, _("Error loading %s"),
+				res->name);
 		return -1;
 	}
 	return 0;
 }
 
+static struct boot_resource *add_boot_resource(struct boot_task *task,
+		const char *name, struct pb_url *url,
+		const char **local_path)
+{
+	struct boot_resource *res;
+
+	if (!url)
+		return NULL;
+
+	res = talloc_zero(task, struct boot_resource);
+	if (!res)
+		return NULL;
+
+	res->name = talloc_strdup(res, name);
+	res->url = pb_url_copy(res, url);
+	res->local_path = local_path;
+
+	list_add(&task->resources, &res->list);
+	return res;
+}
+
 struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		struct boot_command *cmd, int dry_run,
 		boot_status_fn status_fn, void *status_arg)
@@ -490,10 +502,12 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	struct pb_url *image = NULL, *initrd = NULL, *dtb = NULL;
 	struct pb_url *image_sig = NULL, *initrd_sig = NULL, *dtb_sig = NULL,
 		*cmdline_sig = NULL;
-	const struct config *config;
+	struct boot_resource *image_res, *initrd_res, *dtb_res, *tmp;
+	const struct config *config = config_get();
 	struct boot_task *boot_task;
 	const char *boot_desc;
 	int rc;
+	int lockdown_type;
 
 	if (opt && opt->option->name)
 		boot_desc = opt->option->name;
@@ -502,8 +516,8 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	else
 		boot_desc = _("(unknown)");
 
-	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-			_("Booting %s."), boot_desc);
+	update_status(status_fn, status_arg, STATUS_INFO,
+			_("Booting %s"), boot_desc);
 
 	if (cmd && cmd->boot_image_file) {
 		image = pb_url_parse(opt, cmd->boot_image_file);
@@ -511,7 +525,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		image = opt->boot_image->url;
 	} else {
 		pb_log("%s: no image specified\n", __func__);
-		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+		update_status(status_fn, status_arg, STATUS_INFO,
 				_("Boot failed: no image specified"));
 		return NULL;
 	}
@@ -528,12 +542,20 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		dtb = opt->dtb->url;
 	}
 
+	if (opt && opt->proxy) {
+		setenv("http_proxy", opt->proxy, 1);
+		setenv("https_proxy", opt->proxy, 1);
+	}
+
 	boot_task = talloc_zero(ctx, struct boot_task);
 	boot_task->dry_run = dry_run;
 	boot_task->status_fn = status_fn;
 	boot_task->status_arg = status_arg;
+	list_init(&boot_task->resources);
 
-	boot_task->verify_signature = (lockdown_status() == PB_LOCKDOWN_SIGN);
+	lockdown_type = lockdown_status();
+	boot_task->verify_signature = (lockdown_type == PB_LOCKDOWN_SIGN);
+	boot_task->decrypt_files = (lockdown_type == PB_LOCKDOWN_DECRYPT);
 
 	if (cmd && cmd->boot_args) {
 		boot_task->args = talloc_strdup(boot_task, cmd->boot_args);
@@ -544,14 +566,12 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		boot_task->args = NULL;
 	}
 
-	if (cmd && cmd->tty)
-		boot_task->boot_tty = talloc_strdup(boot_task, cmd->tty);
-	else {
-		config = config_get();
-		boot_task->boot_tty = config ? config->boot_tty : NULL;
-	}
+	if (cmd && cmd->console && !config->manual_console)
+		boot_task->boot_console = talloc_strdup(boot_task, cmd->console);
+	else
+		boot_task->boot_console = config ? config->boot_console : NULL;
 
-	if (boot_task->verify_signature) {
+	if (boot_task->verify_signature || boot_task->decrypt_files) {
 		if (cmd && cmd->args_sig_file) {
 			cmdline_sig = pb_url_parse(opt, cmd->args_sig_file);
 		} else if (opt && opt->args_sig_file) {
@@ -559,7 +579,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		} else {
 			pb_log("%s: no command line signature file"
 				" specified\n", __func__);
-			update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+			update_status(status_fn, status_arg, STATUS_INFO,
 					_("Boot failed: no command line"
 						" signature file specified"));
 			talloc_free(boot_task);
@@ -567,33 +587,48 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		}
 	}
 
+	image_res = add_boot_resource(boot_task, _("kernel image"), image,
+			&boot_task->local_image);
+	initrd_res = add_boot_resource(boot_task, _("initrd"), initrd,
+			&boot_task->local_initrd);
+	dtb_res = add_boot_resource(boot_task, _("dtb"), dtb,
+			&boot_task->local_dtb);
+
 	/* start async loads for boot resources */
-	rc = start_url_load(boot_task, "kernel image", image, &boot_task->image)
-	  || start_url_load(boot_task, "initrd", initrd, &boot_task->initrd)
-	  || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb);
+	rc = start_url_load(boot_task, image_res)
+	  || start_url_load(boot_task, initrd_res)
+	  || start_url_load(boot_task, dtb_res);
 
 	if (boot_task->verify_signature) {
 		/* Generate names of associated signature files and load */
 		if (image) {
 			image_sig = gpg_get_signature_url(ctx, image);
-			rc |= start_url_load(boot_task,
-				"kernel image signature", image_sig,
-				&boot_task->image_signature);
+			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);
-			rc |= start_url_load(boot_task, "initrd signature",
-				initrd_sig, &boot_task->initrd_signature);
+			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);
-			rc |= start_url_load(boot_task, "dtb signature",
-				dtb_sig, &boot_task->dtb_signature);
+			tmp = add_boot_resource(boot_task,
+					_("dtb signature"), dtb_sig,
+					&boot_task->local_dtb_signature);
+			rc |= start_url_load(boot_task, tmp);
 		}
+	}
 
-		rc |= start_url_load(boot_task,
-			"kernel command line signature", cmdline_sig,
-			&boot_task->cmdline_signature);
+	if (boot_task->verify_signature || boot_task->decrypt_files) {
+		tmp = add_boot_resource(boot_task,
+				_("kernel command line signature"), cmdline_sig,
+				&boot_task->local_cmdline_signature);
+		rc |= start_url_load(boot_task, tmp);
 	}
 
 	/* If all URLs are local, we may be done. */
@@ -613,7 +648,7 @@ void boot_cancel(struct boot_task *task)
 {
 	task->cancelled = true;
 
-	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
+	update_status(task->status_fn, task->status_arg, STATUS_INFO,
 			_("Boot cancelled"));
 
 	cleanup_cancellations(task, NULL);