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

main: force tty to /dev/tty if $DISPLAY is set

Browse source 
the X11 renderer is useful for testing themes without rebooting,
but it really only functions if the user puts --tty=/dev/tty or
similar.  Furthermore, if a user neglects to do that really bad
stuff happens since plymouth will try to take over VT1.

This commit makes --tty=/dev/tty implied if $DISPLAY is set.
This commit is contained in:
Ray Strode 2013-09-23 15:21:30 -04:00
parent 7f83a660c9
commit 5277809e5a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main.c
View file

@ -2241,6 +2241,11 @@ initialize_environment (state_t *state)
if (!get_kernel_command_line (state))
return false;
if (!state->default_tty)
{
if (getenv ("DISPLAY") != NULL && access (PLYMOUTH_PLUGIN_PATH "renderers/x11.so", F_OK) == 0)
state->default_tty = "/dev/tty";
}
if (!state->default_tty)
{
if (state->mode == PLY_MODE_SHUTDOWN)