diff options
author | Alfonso Sánchez-Beato <alfonso.sanchez-beato@canonical.com> | 2021-09-21 09:29:19 +0200 |
---|---|---|
committer | Ray Strode <halfline@gmail.com> | 2021-09-22 14:18:35 +0000 |
commit | 0c503db27e2c055f5c3ee717cff94dc8c05a056c (patch) | |
tree | 38d7c8460b1eda433f30889387ec712b035c580a | |
parent | 2a4fbd8978f93b44257f00030be1ad66f8b77c40 (diff) |
main: add ignore-serial-consoles option
Add --ignore-serial-consoles option so we can ignore serial consoles
also when starting plymouthd and not only from the kernel command
line.
-rw-r--r-- | src/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -2113,6 +2113,7 @@ main (int argc, bool no_boot_log = false; bool no_daemon = false; bool debug = false; + bool ignore_serial_consoles = false; bool attach_to_session; ply_daemon_handle_t *daemon_handle = NULL; char *mode_string = NULL; @@ -2140,6 +2141,7 @@ main (int argc, "kernel-command-line", "Fake kernel command line to use", PLY_COMMAND_OPTION_TYPE_STRING, "tty", "TTY to use instead of default", PLY_COMMAND_OPTION_TYPE_STRING, "no-boot-log", "Do not write boot log file", PLY_COMMAND_OPTION_TYPE_FLAG, + "ignore-serial-consoles", "Ignore serial consoles", PLY_COMMAND_OPTION_TYPE_FLAG, NULL); if (!ply_command_parser_parse_arguments (state.command_parser, state.loop, argv, argc)) { @@ -2160,6 +2162,7 @@ main (int argc, "no-boot-log", &no_boot_log, "no-daemon", &no_daemon, "debug", &debug, + "ignore-serial-consoles", &ignore_serial_consoles, "debug-file", &debug_buffer_path, "pid-file", &pid_file, "tty", &tty, @@ -2303,7 +2306,8 @@ main (int argc, find_system_default_splash (&state); find_distribution_default_splash (&state); - if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles")) + if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles") || + ignore_serial_consoles == true) device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") || |