diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-08-09 16:01:49 +1000 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-09-08 14:26:27 +1000 |
| commit | 9f42e56fc5968fcb34edfad017adb73960c2bb61 (patch) | |
| tree | 1114b3ed7f7fe9b36e1176268e611e69ed31d1f0 /discover/boot.c | |
| parent | e4a641a6e3133158b003d19ee285cfc37164cb1f (diff) | |
| download | talos-petitboot-9f42e56fc5968fcb34edfad017adb73960c2bb61.tar.gz talos-petitboot-9f42e56fc5968fcb34edfad017adb73960c2bb61.zip | |
Use 'consoles' instead of 'tty' to refer to interfaces
'Console' is more readily understandable and technically more correct
than 'tty' for referring to the interfaces that Petitboot starts a UI on.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover/boot.c')
| -rw-r--r-- | discover/boot.c | 12 |
1 files changed, 6 insertions, 6 deletions
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) { |
