From: Ray Strode <rstrode@redhat.com>
Date: Fri, 7 May 2010 18:49:09 +0000 (-0400)
Subject: [terminal] Don't stomp over original tty lock settings
X-Git-Tag: 0.8.4~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c390bea97ccd2c0f74f63fd90d549dd4f488651;p=thirdparty%2Fplymouth.git

[terminal] Don't stomp over original tty lock settings

We were repetedly saving over the original tty lock settings,
causing the tty to stay locked after boot up.
---

diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
index f71f25af..ff59d719 100644
--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
@@ -188,7 +188,8 @@ ply_terminal_set_unbuffered_input (ply_terminal_t *terminal)
   if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0)
     return false;
 
-  if (ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
+  if (!terminal->original_locked_term_attributes_saved &&
+      ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
     {
       terminal->original_locked_term_attributes = locked_term_attributes;
       terminal->original_locked_term_attributes_saved = true;