rpms/plymouth/F-12 fix-hvc0-console.patch, 1.1, 1.2 plymouth.spec, 1.163, 1.164

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2220

Modified Files:
	fix-hvc0-console.patch plymouth.spec 
Log Message:
- Drop debug spew that snuck in


fix-hvc0-console.patch:
 b/src/libplybootsplash/ply-console.c |    8 ++++++--
 b/src/main.c                         |    4 ----
 src/main.c                           |   15 +++++++++------
 3 files changed, 15 insertions(+), 12 deletions(-)

Index: fix-hvc0-console.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/fix-hvc0-console.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-hvc0-console.patch	29 Oct 2009 22:00:23 -0000	1.1
+++ fix-hvc0-console.patch	30 Oct 2009 16:01:42 -0000	1.2
@@ -124,42 +124,3 @@ index 548e1f7..daef780 100644
  
    if (state->kernel_console_tty != NULL)
      redirect_standard_io_to_device (state->kernel_console_tty);
-@@ -1417,15 +1420,27 @@ dump_debug_buffer_to_file (void)
-   close (fd);
- }
- 
-+ #include <termios.h>
-+ #include <unistd.h>
- static void
- on_crash (int signum)
- {
-+    struct termios term_attributes;
-     int fd;
- 
-     fd = open ("/dev/tty1", O_RDWR | O_NOCTTY);
-+    if (fd < 0) fd = open ("/dev/hvc0", O_RDWR | O_NOCTTY);
- 
-     ioctl (fd, KDSETMODE, KD_TEXT);
- 
-+    tcgetattr (fd, &term_attributes);
-+
-+    term_attributes.c_iflag |= IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON;
-+    term_attributes.c_oflag |= OPOST;
-+    term_attributes.c_lflag |= ECHO | ECHONL | ICANON | ISIG | IEXTEN;
-+
-+    tcsetattr (fd, TCSAFLUSH, &term_attributes);
-+
-     close (fd);
- 
-     if (debug_buffer != NULL)
-@@ -1500,6 +1515,7 @@ main (int    argc,
-       return 0;
-     }
- 
-+  debug = 1;
-   if (debug && !ply_is_tracing ())
-     ply_toggle_tracing ();
- 
--- 
-1.6.5.1
-


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- plymouth.spec	29 Oct 2009 22:00:23 -0000	1.163
+++ plymouth.spec	30 Oct 2009 16:01:42 -0000	1.164
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.15%{?dist}
+Release: 0.2009.29.09.16%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -475,6 +475,9 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Fri Oct 30 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.16
+- Drop debug spew that snuck in
+
 * Thu Oct 29 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.15
 - Fix plymouth over ppc hyperviser console (bug 531581)