rpms/plymouth/F-13 lock-tty.patch,1.1,1.2 plymouth.spec,1.167,1.168

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29737

Modified Files:
	lock-tty.patch plymouth.spec 
Log Message:
- Fix tty locking patch
  Resolves: #585128


lock-tty.patch:
 b/src/libply-splash-core/ply-terminal.c |   26 +++++++++++++++++++++++++-
 src/libply-splash-core/ply-terminal.c   |    4 ++--
 2 files changed, 27 insertions(+), 3 deletions(-)

Index: lock-tty.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-13/lock-tty.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lock-tty.patch	19 Apr 2010 14:05:13 -0000	1.1
+++ lock-tty.patch	7 May 2010 19:00:38 -0000	1.2
@@ -96,3 +96,31 @@ index 3e90dec..8b099b8 100644
 -- 
 1.6.5.2
 
+From 8c390bea97ccd2c0f74f63fd90d549dd4f488651 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 7 May 2010 14:49:09 -0400
+Subject: [PATCH] [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.
+---
+ src/libply-splash-core/ply-terminal.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
+index f71f25a..ff59d71 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;
+-- 
+1.6.5.2
+


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-13/plymouth.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- plymouth.spec	19 Apr 2010 14:01:29 -0000	1.167
+++ plymouth.spec	7 May 2010 19:00:38 -0000	1.168
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -444,6 +444,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri May 07 2010 Ray Strode <rstrode at redhat.com> 0.8.2-3
+- Fix tty locking patch
+  Resolves: #585128
+
 * Mon Apr 19 2010 Ray Strode <rstrode at redhat.com> 0.8.2-2
 - Lock tty into raw mode
   Resolves: #579686