From: Ray Strode <rstrode@redhat.com>
Date: Fri, 14 Aug 2009 12:44:47 +0000 (-0400)
Subject: [window] Reopen tty if disconnected
X-Git-Tag: 0.7.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b13eb70d43925dc73ebbd06f6a2a01d2b4ef32;p=thirdparty%2Fplymouth.git

[window] Reopen tty if disconnected

Some init implementations forcefully take over the tty after rc.sysinit
with the TIOCSCTTY ioctl, forcing plymouth's connection to the tty
to get dropped.  This comment just reopens the tty if it gets taken
over.

It may make sense at some point to use /dev/input for catching input
events instead of the tty, to side step these kinds of problems.
---

diff --git a/src/libplybootsplash/ply-window.c b/src/libplybootsplash/ply-window.c
index 8fa60377..27328930 100644
--- a/src/libplybootsplash/ply-window.c
+++ b/src/libplybootsplash/ply-window.c
@@ -146,6 +146,8 @@ struct _ply_window
   void *erase_handler_user_data;
 };
 
+static bool ply_window_open_tty (ply_window_t *window);
+
 ply_window_t *
 ply_window_new (const char *tty_name)
 {
@@ -422,6 +424,13 @@ on_tty_disconnected (ply_window_t *window)
 {
   ply_trace ("tty disconnected (fd %d)", window->tty_fd);
   window->tty_fd_watch = NULL;
+  window->tty_fd = -1;
+
+  if (window->tty_name != NULL)
+    {
+      ply_trace ("trying to reopen window '%s'", window->tty_name);
+      ply_window_open_tty (window);
+    }
 }
 
 static bool
@@ -528,12 +537,33 @@ ply_window_look_up_geometry (ply_window_t *window)
     return true;
 }
 
-bool
-ply_window_open (ply_window_t *window)
+static bool
+ply_window_open_tty (ply_window_t *window)
 {
   assert (window != NULL);
   assert (window->tty_name != NULL);
   assert (window->tty_fd < 0);
+  assert (window->tty_fd_watch == NULL);
+
+  window->tty_fd = open (window->tty_name, O_RDWR | O_NOCTTY);
+
+  if (window->tty_fd < 0)
+    return false;
+
+  if (window->loop != NULL)
+    window->tty_fd_watch = ply_event_loop_watch_fd (window->loop, window->tty_fd,
+                                                    PLY_EVENT_LOOP_FD_STATUS_HAS_DATA,
+                                                    (ply_event_handler_t) on_key_event,
+                                                    (ply_event_handler_t) on_tty_disconnected,
+                                                    window);
+
+  return true;
+}
+
+bool
+ply_window_open (ply_window_t *window)
+{
+  assert (window != NULL);
 
   if (window->tty_name == NULL)
     {
@@ -552,9 +582,7 @@ ply_window_open (ply_window_t *window)
 
   ply_trace ("trying to open window '%s'", window->tty_name);
 
-  window->tty_fd = open (window->tty_name, O_RDWR | O_NOCTTY);
-
-  if (window->tty_fd < 0)
+  if (!ply_window_open_tty (window))
     {
       ply_trace ("could not open %s : %m", window->tty_name);
       return false;
@@ -576,13 +604,6 @@ ply_window_open (ply_window_t *window)
                                ply_window_look_up_geometry,
                                window);
 
-  if (window->loop != NULL)
-    window->tty_fd_watch = ply_event_loop_watch_fd (window->loop, window->tty_fd,
-                                                    PLY_EVENT_LOOP_FD_STATUS_HAS_DATA,
-                                                    (ply_event_handler_t) on_key_event,
-                                                    (ply_event_handler_t) on_tty_disconnected,
-                                                    window);
-
   /* We try to open the frame buffer, but it may fail. splash plugins can check
    * to see if it's open and react accordingly
    */