0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. From e6f09b05707be8aec488d757c5abe56cb3060a75 Mon Sep 17 00:00:00 2001
  2. From: Adam Williamson <awilliam@redhat.com>
  3. Date: Sat, 16 Mar 2024 17:22:57 -0700
  4. Subject: [PATCH] Revert "src: Hide console text when splash is requested"
  5. This reverts commit 48881ba2ef3d25fd27fd150d4d5957d4df9868e0.
  6. It breaks display entirely on minimal installs.
  7. ---
  8. src/libply-splash-core/ply-terminal.c | 2 --
  9. src/main.c | 12 ++++--------
  10. 2 files changed, 4 insertions(+), 10 deletions(-)
  11. diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
  12. index 1a9ec353..2036e507 100644
  13. --- a/src/libply-splash-core/ply-terminal.c
  14. +++ b/src/libply-splash-core/ply-terminal.c
  15. @@ -357,8 +357,6 @@ ply_terminal_write (ply_terminal_t *terminal,
  16. assert (terminal != NULL);
  17. assert (format != NULL);
  18. - ply_terminal_set_mode (terminal, PLY_TERMINAL_MODE_TEXT);
  19. -
  20. string = NULL;
  21. va_start (args, format);
  22. size = vasprintf (&string, format, args);
  23. diff --git a/src/main.c b/src/main.c
  24. index 33fe51e0..81e34c54 100644
  25. --- a/src/main.c
  26. +++ b/src/main.c
  27. @@ -1000,14 +1000,6 @@ on_show_splash (state_t *state)
  28. if (!state->is_attached && state->should_be_attached && has_displays)
  29. attach_to_running_session (state);
  30. - if (state->local_console_terminal != NULL)
  31. - ply_terminal_set_mode (state->local_console_terminal, PLY_TERMINAL_MODE_GRAPHICS);
  32. -
  33. -#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
  34. - if (state->is_attached)
  35. - tell_systemd_to_print_details (state);
  36. -#endif
  37. -
  38. if (has_displays) {
  39. ply_trace ("at least one display already available, so loading splash");
  40. show_splash (state);
  41. @@ -1438,6 +1430,10 @@ on_quit (state_t *state,
  42. state->quit_trigger = quit_trigger;
  43. state->should_retain_splash = retain_splash;
  44. +#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
  45. + tell_systemd_to_stop_printing_details (state);
  46. +#endif
  47. +
  48. ply_trace ("closing log");
  49. if (state->session != NULL)
  50. ply_terminal_session_close_log (state->session);
  51. --
  52. 2.44.0