From 5277809e5a95e9fec8a80f2072673b383bcc80cc Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 23 Sep 2013 15:21:30 -0400 Subject: [PATCH] main: force tty to /dev/tty if $DISPLAY is set 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. --- src/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main.c b/src/main.c index 81584a5e..9c450c0c 100644 --- a/src/main.c +++ b/src/main.c @@ -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)