X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;fp=discover%2Fboot.c;h=0732a50aea0318fce5f2fc5225716b50c8350776;hp=c25627d0a9bd83ec4162a788e53a44f811a49f72;hb=9f42e56fc5968fcb34edfad017adb73960c2bb61;hpb=e4a641a6e3133158b003d19ee285cfc37164cb1f

diff --git a/discover/boot.c b/discover/boot.c
index c25627d..0732a50 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -220,7 +220,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)
@@ -229,8 +229,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)
@@ -574,11 +574,11 @@ 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);
+	if (cmd && cmd->console)
+		boot_task->boot_console = talloc_strdup(boot_task, cmd->console);
 	else {
 		config = config_get();
-		boot_task->boot_tty = config ? config->boot_tty : NULL;
+		boot_task->boot_console = config ? config->boot_console : NULL;
 	}
 
 	if (boot_task->verify_signature || boot_task->decrypt_files) {