|
 |
bd3c751 |
From e6f09b05707be8aec488d757c5abe56cb3060a75 Mon Sep 17 00:00:00 2001
|
|
|
bd3c751 |
From: Adam Williamson <awilliam@redhat.com>
|
|
|
bd3c751 |
Date: Sat, 16 Mar 2024 17:22:57 -0700
|
|
|
bd3c751 |
Subject: [PATCH] Revert "src: Hide console text when splash is requested"
|
|
|
bd3c751 |
|
|
|
bd3c751 |
This reverts commit 48881ba2ef3d25fd27fd150d4d5957d4df9868e0.
|
|
|
bd3c751 |
It breaks display entirely on minimal installs.
|
|
|
bd3c751 |
---
|
|
|
bd3c751 |
src/libply-splash-core/ply-terminal.c | 2 --
|
|
|
bd3c751 |
src/main.c | 12 ++++--------
|
|
|
bd3c751 |
2 files changed, 4 insertions(+), 10 deletions(-)
|
|
|
bd3c751 |
|
|
|
bd3c751 |
diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
|
|
|
bd3c751 |
index 1a9ec353..2036e507 100644
|
|
|
bd3c751 |
--- a/src/libply-splash-core/ply-terminal.c
|
|
|
bd3c751 |
+++ b/src/libply-splash-core/ply-terminal.c
|
|
|
bd3c751 |
@@ -357,8 +357,6 @@ ply_terminal_write (ply_terminal_t *terminal,
|
|
|
bd3c751 |
assert (terminal != NULL);
|
|
|
bd3c751 |
assert (format != NULL);
|
|
|
bd3c751 |
|
|
|
bd3c751 |
- ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
|
|
|
bd3c751 |
-
|
|
|
bd3c751 |
string = NULL;
|
|
|
bd3c751 |
va_start (args, format);
|
|
|
bd3c751 |
size = vasprintf (&string, format, args);
|
|
|
bd3c751 |
diff --git a/src/main.c b/src/main.c
|
|
|
bd3c751 |
index 33fe51e0..81e34c54 100644
|
|
|
bd3c751 |
--- a/src/main.c
|
|
|
bd3c751 |
+++ b/src/main.c
|
|
|
bd3c751 |
@@ -1000,14 +1000,6 @@ on_show_splash (state_t *state)
|
|
|
bd3c751 |
if (!state->is_attached && state->should_be_attached && has_displays)
|
|
|
bd3c751 |
attach_to_running_session (state);
|
|
|
bd3c751 |
|
|
|
bd3c751 |
- if (state->local_console_terminal != NULL)
|
|
|
bd3c751 |
- ply_terminal_set_mode (state->local_console_terminal, PLY_TERMINAL_MODE_GRAPHICS);
|
|
|
bd3c751 |
-
|
|
|
bd3c751 |
-#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
|
|
|
bd3c751 |
- if (state->is_attached)
|
|
|
bd3c751 |
- tell_systemd_to_print_details (state);
|
|
|
bd3c751 |
-#endif
|
|
|
bd3c751 |
-
|
|
|
bd3c751 |
if (has_displays) {
|
|
|
bd3c751 |
ply_trace ("at least one display already available, so loading splash");
|
|
|
bd3c751 |
show_splash (state);
|
|
|
bd3c751 |
@@ -1438,6 +1430,10 @@ on_quit (state_t *state,
|
|
|
bd3c751 |
state->quit_trigger = quit_trigger;
|
|
|
bd3c751 |
state->should_retain_splash = retain_splash;
|
|
|
bd3c751 |
|
|
|
bd3c751 |
+#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
|
|
|
bd3c751 |
+ tell_systemd_to_stop_printing_details (state);
|
|
|
bd3c751 |
+#endif
|
|
|
bd3c751 |
+
|
|
|
bd3c751 |
ply_trace ("closing log");
|
|
|
bd3c751 |
if (state->session != NULL)
|
|
|
bd3c751 |
ply_terminal_session_close_log (state->session);
|
|
|
bd3c751 |
--
|
|
|
bd3c751 |
2.44.0
|
|
|
bd3c751 |
|