diff --git a/0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch b/0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch new file mode 100644 index 0000000..d18b9c8 --- /dev/null +++ b/0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch @@ -0,0 +1,58 @@ +From e6f09b05707be8aec488d757c5abe56cb3060a75 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Sat, 16 Mar 2024 17:22:57 -0700 +Subject: [PATCH] Revert "src: Hide console text when splash is requested" + +This reverts commit 48881ba2ef3d25fd27fd150d4d5957d4df9868e0. +It breaks display entirely on minimal installs. +--- + src/libply-splash-core/ply-terminal.c | 2 -- + src/main.c | 12 ++++-------- + 2 files changed, 4 insertions(+), 10 deletions(-) + +diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c +index 1a9ec353..2036e507 100644 +--- a/src/libply-splash-core/ply-terminal.c ++++ b/src/libply-splash-core/ply-terminal.c +@@ -357,8 +357,6 @@ ply_terminal_write (ply_terminal_t *terminal, + assert (terminal != NULL); + assert (format != NULL); + +- ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT); +- + string = NULL; + va_start (args, format); + size = vasprintf (&string, format, args); +diff --git a/src/main.c b/src/main.c +index 33fe51e0..81e34c54 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1000,14 +1000,6 @@ on_show_splash (state_t *state) + if (!state->is_attached && state->should_be_attached && has_displays) + attach_to_running_session (state); + +- if (state->local_console_terminal != NULL) +- ply_terminal_set_mode (state->local_console_terminal, PLY_TERMINAL_MODE_GRAPHICS); +- +-#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION +- if (state->is_attached) +- tell_systemd_to_print_details (state); +-#endif +- + if (has_displays) { + ply_trace ("at least one display already available, so loading splash"); + show_splash (state); +@@ -1438,6 +1430,10 @@ on_quit (state_t *state, + state->quit_trigger = quit_trigger; + state->should_retain_splash = retain_splash; + ++#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION ++ tell_systemd_to_stop_printing_details (state); ++#endif ++ + ply_trace ("closing log"); + if (state->session != NULL) + ply_terminal_session_close_log (state->session); +-- +2.44.0 + diff --git a/plymouth.spec b/plymouth.spec index b35e659..8548c65 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -8,6 +8,11 @@ URL: http://www.freedesktop.org/wiki/Software/Plymouth Source0: https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source2: charge.plymouth +# Revert https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/48881ba +# to fix console display on minimal installs +# https://bugzilla.redhat.com/show_bug.cgi?id=2269385 +Patch: 0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch + BuildRequires: meson BuildRequires: system-logos BuildRequires: gcc libtool git