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/platform-powerpc.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/platform-powerpc.c')
| -rw-r--r-- | discover/platform-powerpc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 2b89121..57618c3 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -569,7 +569,7 @@ static void populate_config(struct platform_powerpc *platform, val = get_param(platform, "petitboot,tty"); if (val) - config->boot_tty = talloc_strdup(config, val); + config->boot_console = talloc_strdup(config, val); } static char *iface_config_str(void *ctx, struct interface_config *config) @@ -746,7 +746,7 @@ static int update_config(struct platform_powerpc *platform, val = config->allow_writes ? "true" : "false"; update_string_config(platform, "petitboot,write?", val); - val = config->boot_tty ?: ""; + val = config->boot_console ?: ""; update_string_config(platform, "petitboot,tty", val); update_network_config(platform, config); @@ -1239,32 +1239,32 @@ static void get_active_consoles(struct config *config) struct stat sbuf; char *fsp_prop = NULL; - config->n_tty = 2; - config->tty_list = talloc_array(config, char *, config->n_tty); - if (!config->tty_list) + config->n_consoles = 2; + config->consoles = talloc_array(config, char *, config->n_consoles); + if (!config->consoles) goto err; - config->tty_list[0] = talloc_asprintf(config->tty_list, + config->consoles[0] = talloc_asprintf(config->consoles, "/dev/hvc0 [IPMI / Serial]"); - config->tty_list[1] = talloc_asprintf(config->tty_list, + config->consoles[1] = talloc_asprintf(config->consoles, "/dev/tty1 [VGA]"); fsp_prop = talloc_asprintf(config, "%sfsps", devtree_dir); if (stat(fsp_prop, &sbuf) == 0) { /* FSP based machines also have a separate serial console */ - config->tty_list = talloc_realloc(config, config->tty_list, - char *, config->n_tty + 1); - if (!config->tty_list) + config->consoles = talloc_realloc(config, config->consoles, + char *, config->n_consoles + 1); + if (!config->consoles) goto err; - config->tty_list[config->n_tty++] = talloc_asprintf( - config->tty_list, + config->consoles[config->n_consoles++] = talloc_asprintf( + config->consoles, "/dev/hvc1 [Serial]"); } return; err: - config->n_tty = 0; - pb_log("Failed to allocate memory for tty_list\n"); + config->n_consoles = 0; + pb_log("Failed to allocate memory for consoles\n"); } static int load_config(struct platform *p, struct config *config) |
