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 <sam@mendozajonas.com>
struct config *dest;
unsigned int i;
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;
dest->autoboot_enabled = src->autoboot_enabled;
dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
dest->safe_mode = src->safe_mode;
dest->allow_writes = src->allow_writes;
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
if (src->lang && strlen(src->lang))
dest->lang = talloc_strdup(dest, src->lang);
else
4 + optional_strlen(boot->boot_image_file) +
4 + optional_strlen(boot->initrd_file) +
4 + optional_strlen(boot->dtb_file) +
4 + optional_strlen(boot->boot_image_file) +
4 + optional_strlen(boot->initrd_file) +
4 + optional_strlen(boot->dtb_file) +
- 4 + optional_strlen(boot->boot_args);
+ 4 + optional_strlen(boot->boot_args) +
+ 4 + optional_strlen(boot->tty);
}
int pb_protocol_boot_status_len(const struct boot_status *status)
}
int pb_protocol_boot_status_len(const struct boot_status *status)
len += 4; /* allow_writes */
len += 4; /* allow_writes */
+ len += 4; /* n_tty */
+ for (i = 0; i < config->n_tty; i++)
+ len += 4 + optional_strlen(config->tty_list[i]);
+
+ len += 4 + optional_strlen(config->boot_tty);
+
len += 4 + optional_strlen(config->lang);
return len;
len += 4 + optional_strlen(config->lang);
return len;
pos += pb_protocol_serialise_string(pos, boot->initrd_file);
pos += pb_protocol_serialise_string(pos, boot->dtb_file);
pos += pb_protocol_serialise_string(pos, boot->boot_args);
pos += pb_protocol_serialise_string(pos, boot->initrd_file);
pos += pb_protocol_serialise_string(pos, boot->dtb_file);
pos += pb_protocol_serialise_string(pos, boot->boot_args);
+ pos += pb_protocol_serialise_string(pos, boot->tty);
assert(pos <= buf + buf_len);
(void)buf_len;
assert(pos <= buf + buf_len);
(void)buf_len;
*(uint32_t *)pos = config->allow_writes;
pos += 4;
*(uint32_t *)pos = config->allow_writes;
pos += 4;
+ *(uint32_t *)pos = __cpu_to_be32(config->n_tty);
+ pos += 4;
+ for (i = 0; i < config->n_tty; i++)
+ pos += pb_protocol_serialise_string(pos, config->tty_list[i]);
+
+ pos += pb_protocol_serialise_string(pos, config->boot_tty);
+
pos += pb_protocol_serialise_string(pos, config->lang);
assert(pos <= buf + buf_len);
pos += pb_protocol_serialise_string(pos, config->lang);
assert(pos <= buf + buf_len);
if (read_string(cmd, &pos, &len, &cmd->boot_args))
goto out;
if (read_string(cmd, &pos, &len, &cmd->boot_args))
goto out;
+ if (read_string(cmd, &pos, &len, &cmd->tty))
+ goto out;
+
goto out;
config->allow_writes = !!tmp;
goto out;
config->allow_writes = !!tmp;
+ if (read_u32(&pos, &len, &config->n_tty))
+ goto out;
+
+ config->tty_list = talloc_array(config, char *, config->n_tty);
+ for (i = 0; i < config->n_tty; i++) {
+ if (read_string(config->tty_list, &pos, &len, &str))
+ goto out;
+ config->tty_list[i] = str;
+ }
+
+ if (read_string(config, &pos, &len, &str))
+ goto out;
+
+ config->boot_tty = str;
+
if (read_string(config, &pos, &len, &str))
goto out;
if (read_string(config, &pos, &len, &str))
goto out;
char *initrd_file;
char *dtb_file;
char *boot_args;
char *initrd_file;
char *dtb_file;
char *boot_args;
char *lang;
/* not user-settable */
char *lang;
/* not user-settable */
+ unsigned int n_tty;
+ char **tty_list;
bool disable_snapshots;
bool safe_mode;
bool debug;
bool disable_snapshots;
bool safe_mode;
bool debug;