From: Ray Strode <rstrode@redhat.com>
Date: Mon, 30 Jun 2008 19:59:38 +0000 (-0400)
Subject: Stay on tty1 for now
X-Git-Tag: 0.5.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfbde7255758808c205b0880fbf861ead4fa15d2;p=thirdparty%2Fplymouth.git

Stay on tty1 for now

Using tty7 is making X go to vt8 and putting us on
the wrong vt for runlevel 3. Eventually, we'll need
to make X start ont he same vt as plymouth, and go
back to vt1 if doing runlevel 3.
---

diff --git a/src/main.c b/src/main.c
index dffae0a7..0c82db1d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -165,7 +165,7 @@ on_show_splash (state_t *state)
 
   if (state->window == NULL)
     {
-      state->window = create_window (state, 7);
+      state->window = create_window (state, 1);
       ply_window_take_console (state->window);
     }
 
@@ -387,11 +387,11 @@ check_verbosity (state_t *state)
 }
 
 static bool
-set_console_io_to_vt7 (state_t *state)
+set_console_io_to_vt1 (state_t *state)
 {
   int fd;
 
-  fd = open ("/dev/tty7", O_RDWR | O_APPEND);
+  fd = open ("/dev/tty1", O_RDWR | O_APPEND);
 
   if (fd < 0)
     return false;
@@ -448,7 +448,7 @@ initialize_environment (state_t *state)
   if (!plymouth_should_be_running (state))
     return false;
 
-  if (!set_console_io_to_vt7 (state))
+  if (!set_console_io_to_vt1 (state))
     return false;
 
   ply_trace ("initialized minimal work environment");
@@ -460,7 +460,7 @@ on_crash (int signal)
 {
     int fd;
 
-    fd = open ("/dev/tty7", O_RDWR | O_NOCTTY);
+    fd = open ("/dev/tty1", O_RDWR | O_NOCTTY);
 
     ioctl (fd, KDSETMODE, KD_TEXT);