rpms/plymouth/devel plymouth-0.6.0-drop-nash.patch, NONE, 1.1 plymouth.spec, 1.116, 1.117

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29231

Modified Files:
	plymouth.spec 
Added Files:
	plymouth-0.6.0-drop-nash.patch 
Log Message:
- Add patch from drop-nash branch for jeremy


plymouth-0.6.0-drop-nash.patch:

--- NEW FILE plymouth-0.6.0-drop-nash.patch ---
============================================================
 Create pseudo-terminal if one isn't passed in

  This may help us drop the nash depedency for
pty handling.

diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c
--- a/src/libply/ply-terminal-session.c
+++ b/src/libply/ply-terminal-session.c
@@ -309,12 +309,24 @@ ply_terminal_session_attach (ply_terminal_session_t               *session,
   assert (session->loop != NULL);
   assert (!session->is_running);
   assert (session->done_handler == NULL);
-  assert (ptmx >= 0);
 
   should_redirect_console = 
     (flags & PLY_TERMINAL_SESSION_FLAGS_REDIRECT_CONSOLE) != 0;
 
-  ply_terminal_set_fd(session->terminal, ptmx);
+  if (ptmx >= 0)
+    {
+      ply_trace ("ptmx passed in, using it");
+      ply_terminal_set_fd(session->terminal, ptmx);
+    }
+  else
+    {
+      ply_trace ("ptmx not passed in, creating one");
+      if (!ply_terminal_create_device (session->terminal))
+        {
+          ply_trace ("could not create pseudo-terminal: %m");
+          return false;
+        }
+    }
 
   if (should_redirect_console)
     ply_trace ("redirecting system console to terminal device");
diff --git a/src/main.c b/src/main.c
--- a/src/main.c
+++ b/src/main.c
@@ -838,12 +838,6 @@ main (int    argc,
         }
     }
 
-  if ((attach_to_session && argc != 3) || (attach_to_session && state.ptmx == -1))
-    {
-      ply_error ("%s [--attach-to-session <pty_master_fd>]", argv[0]);
-      return EX_USAGE;
-    }
-
   if (geteuid () != 0)
     {
       ply_error ("plymouthd must be run as root user");


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- plymouth.spec	3 Dec 2008 15:16:39 -0000	1.116
+++ plymouth.spec	17 Dec 2008 21:38:08 -0000	1.117
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -20,6 +20,8 @@
 
 Obsoletes: plymouth-text-and-details-only < %{version}-%{release}
 
+Patch0: plymouth-0.6.0-drop-nash.patch
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -149,6 +151,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .drop-nash
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -311,6 +314,9 @@
 %defattr(-, root, root)
 
 %changelog
+* Wed Dec 17 2008 Ray Strode <rstrode at redhat.com> 0.6.0-2
+- Add patch from drop-nash branch for jeremy
+
 * Wed Dec  3 2008 Ray Strode <rstrode at redhat.com> 0.6.0-1
 - Update to 0.6.0