From d19b94a83870f7b2a41e55d7462bcf36d2b5ba0b Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Tue, 7 Jun 2016 16:23:52 +1000 Subject: lib: Add support for tracking boot consoles Add tty_list and boot_tty to the config struct to keep track of available console interfaces and the default console to set as primary respectively. Also add a tty field to the boot_command struct so that the current console can be sent to the discover server during a manual boot command. Signed-off-by: Samuel Mendoza-Jonas --- lib/pb-config/pb-config.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/pb-config') diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index 92c7e74..52a43b1 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -42,7 +42,7 @@ struct config *config_copy(void *ctx, const struct config *src) struct config *dest; unsigned int i; - dest = talloc(ctx, struct config); + dest = talloc_zero(ctx, struct config); dest->autoboot_enabled = src->autoboot_enabled; dest->autoboot_timeout_sec = src->autoboot_timeout_sec; dest->safe_mode = src->safe_mode; @@ -82,6 +82,16 @@ struct config *config_copy(void *ctx, const struct config *src) dest->allow_writes = src->allow_writes; + dest->n_tty = src->n_tty; + if (src->tty_list) + dest->tty_list = talloc_array(dest, char *, src->n_tty); + for (i = 0; i < src->n_tty && src->n_tty; i++) + dest->tty_list[i] = talloc_strdup(dest->tty_list, + src->tty_list[i]); + + if (src->boot_tty) + dest->boot_tty = talloc_strdup(dest, src->boot_tty); + if (src->lang && strlen(src->lang)) dest->lang = talloc_strdup(dest, src->lang); else -- cgit v1.1