X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fboot.c;h=04e7a543919a819686ca1027ab11dfe628098e5a;hb=a23c3271090ddb9004678b8ede3b2ba8f83d7acf;hp=ce9c1e099f071d51245b8610e90db514fcb7a29b;hpb=1d69ceee0b8fac1f4451a75b6e4b14ee2d5d91dc;p=petitboot

diff --git a/discover/boot.c b/discover/boot.c
index ce9c1e0..04e7a54 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -18,11 +18,13 @@
 #include <talloc/talloc.h>
 #include <url/url.h>
 #include <util/util.h>
+#include <i18n/i18n.h>
 
 #include "device-handler.h"
 #include "boot.h"
 #include "paths.h"
 #include "resource.h"
+#include "platform.h"
 
 static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d";
 enum {
@@ -38,6 +40,7 @@ struct boot_task {
 	const char *local_initrd;
 	const char *local_dtb;
 	const char *args;
+	const char *boot_tty;
 	boot_status_fn status_fn;
 	void *status_arg;
 	bool dry_run;
@@ -74,12 +77,10 @@ static int kexec_load(struct boot_task *boot_task)
 		*p++ = s_dtb;		 /* 4 */
 	}
 
-	if (boot_task->args) {
-		s_args = talloc_asprintf(boot_task, "--append=%s",
-						boot_task->args);
-		assert(s_args);
-		*p++ = s_args;		/* 5 */
-	}
+	s_args = talloc_asprintf(boot_task, "--append=%s",
+				boot_task->args ?: "\"\"");
+	assert(s_args);
+	*p++ = s_args;		/* 5 */
 
 	*p++ = boot_task->local_image;	/* 6 */
 	*p++ = NULL;			/* 7 */
@@ -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) {
 
@@ -205,6 +206,7 @@ static void boot_hook_setenv(struct boot_task *task)
 	unsetenv("boot_initrd");
 	unsetenv("boot_dtb");
 	unsetenv("boot_args");
+	unsetenv("boot_tty");
 
 	setenv("boot_image", task->local_image, 1);
 	if (task->local_initrd)
@@ -213,6 +215,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);
 }
 
 static int hook_filter(const struct dirent *dirent)
@@ -235,7 +239,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 +302,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;
 }
 
@@ -381,12 +385,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:
@@ -397,13 +401,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"));
 		}
 	}
 }
@@ -418,7 +422,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;
@@ -429,6 +433,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		boot_status_fn status_fn, void *status_arg)
 {
 	struct pb_url *image = NULL, *initrd = NULL, *dtb = NULL;
+	const struct config *config;
 	struct boot_task *boot_task;
 	const char *boot_desc;
 	int rc;
@@ -438,10 +443,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);
@@ -450,7 +455,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;
 	}
 
@@ -480,14 +485,22 @@ 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;
+	}
+
 	/* 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);
 
-	/* If all URLs are local, we may be done. */
 	if (rc) {
-		talloc_free(boot_task);
+		/* Don't call boot_cancel() to preserve the status update */
+		boot_task->cancelled = true;
+		cleanup_cancellations(boot_task, NULL);
 		return NULL;
 	}
 
@@ -501,7 +514,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);
 }