fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-05 05:17:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Track "attached" versus "redirected" separately

Browse source 
We only want to try to attach the terminal session
to a terminal if it's not already attached.  It may
be legitimately unredirected if plymouth:nolog is
passed.
This commit is contained in:
Ray Strode 2008-11-10 11:07:06 -05:00
parent 90abd28a02
commit a739a8ecaf
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main.c
View file

@ -63,6 +63,8 @@ typedef struct
uint32_t no_boot_log : 1;
uint32_t showing_details : 1;
uint32_t system_initialized : 1;
uint32_t is_redirected : 1;
uint32_t is_attached : 1;
char *console;
@ -311,8 +313,22 @@ close_windows (state_t *state)
static void
on_show_splash (state_t *state)
{
bool has_window;
open_windows (state);
has_window = has_open_window (state);
if (!state->is_attached && state->ptmx >= 0 && has_window)
state->is_attached = attach_to_running_session (state);
if (!has_window && state->is_attached)
{
ply_trace ("no open windows, detaching session");
ply_terminal_session_detach (state->session);
state->is_attached = false;
}
if (plymouth_should_show_default_splash (state))
show_default_splash (state);
else
@ -554,10 +570,17 @@ attach_to_running_session (state_t *state)
ply_buffer_free (state->boot_buffer);
state->boot_buffer = NULL;
ply_restore_errno ();
return NULL;
state->is_redirected = false;
state->is_attached = false;
return false;
}
return session;
state->is_redirected = should_be_redirected;
state->is_attached = true;
state->session = session;
return true;
}
static bool