rpms/rhgb/devel rhgb-0.17.7-strict-exit.patch, NONE, 1.1 rhgb.spec, 1.82, 1.83

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/rhgb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18728

Modified Files:
	rhgb.spec 
Added Files:
	rhgb-0.17.7-strict-exit.patch 
Log Message:
* Tue Oct 09 2007 Adam Jackson <ajax at redhat.com> 0.17.7-2
- rhgb-0.17.7-strict-exit.patch: Don't tell rhgb-client we're done until
  we've really shut down X.  (#323501)


rhgb-0.17.7-strict-exit.patch:

--- NEW FILE rhgb-0.17.7-strict-exit.patch ---
diff -up rhgb-0.17.7/src/rhgb-client.c.jx rhgb-0.17.7/src/rhgb-client.c
--- rhgb-0.17.7/src/rhgb-client.c.jx	2004-09-14 13:02:57.000000000 -0400
+++ rhgb-0.17.7/src/rhgb-client.c	2007-10-09 16:02:24.000000000 -0400
@@ -107,7 +107,7 @@ quit_watcher (GIOChannel   *source,
     case G_IO_STATUS_NORMAL:
       if (bytes_read >= 20)
 	goto done;
-      if (strcmp (buffer, "done"))
+      if (!strcmp (buffer, "done"))
 	g_main_loop_quit (loop);
       return TRUE;
     case G_IO_STATUS_AGAIN:
diff -up rhgb-0.17.7/src/main.c.jx rhgb-0.17.7/src/main.c
--- rhgb-0.17.7/src/main.c.jx	2007-10-01 10:00:38.000000000 -0400
+++ rhgb-0.17.7/src/main.c	2007-10-09 15:09:30.000000000 -0400
@@ -164,18 +164,24 @@ DEBUG_MESSAGE (const char *message, ...)
   g_free (full_message);
 }
 
-/*
- * The shutdown function. Kill the specific X process, and umount
- * the special filesystem
- */
 static void
-rhgb_shutdown(void)
+do_quit(void)
 {
     if (child_pid > 0) {
         kill (child_pid, SIGTERM);
         waitpid(child_pid, NULL, 0);
 	child_pid = 0;
     }
+}
+
+/*
+ * The shutdown function. Kill the specific X process, and umount
+ * the special filesystem
+ */
+static void
+rhgb_shutdown(void)
+{
+    do_quit();
     if (socket_fd >= 0) {
 	close(socket_fd);
 	socket_fd = -1;
@@ -198,11 +204,7 @@ rhgb_shutdown(void)
  */
 static void
 got_signal(int no ATTRIBUTE_UNUSED) {
-    if (child_pid > 0) {
-        kill (child_pid, SIGTERM);
-        waitpid(child_pid, NULL, 0);
-	child_pid = 0;
-    }
+    do_quit();
     if (socket_fd >= 0) {
 	close(socket_fd);
     }
@@ -381,11 +383,7 @@ static void
 setup_failed (void)
 {
   /* Do something */
-  if (child_pid > 0) {
-    kill (child_pid, SIGTERM);
-    waitpid(child_pid, NULL, 0);
-    child_pid = 0;
-  }
+  do_quit();
   close(socket_fd);
   close(pipe_fd);
   unlink(SOCKET_NAME);
@@ -655,8 +653,9 @@ handle_command (char *command, gint retu
   if (! strcmp (command, "quit"))
     {
       gtk_main_quit ();
-      write (return_fd, "done", strlen("done") + 1);
       update_progress_bar("loginscreen");
+      do_quit();
+      write (return_fd, "done", strlen("done") + 1);
     }
   else if (! strcmp (command, "ping"))
     {


Index: rhgb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- rhgb.spec	1 Oct 2007 14:09:14 -0000	1.82
+++ rhgb.spec	9 Oct 2007 21:06:08 -0000	1.83
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.17.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
@@ -17,11 +17,14 @@
 Requires: initscripts >= 7.22-1
 Requires: system-logos
 
+Patch0: rhgb-0.17.7-strict-exit.patch
+
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
 
 %prep
 %setup -q
+%patch0 -p1 -b .strict-exit
 
 %build
 %configure
@@ -51,6 +54,10 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Tue Oct 09 2007 Adam Jackson <ajax at redhat.com> 0.17.7-2
+- rhgb-0.17.7-strict-exit.patch: Don't tell rhgb-client we're done until
+  we've really shut down X.  (#323501)
+
 * Mon Oct  1 2007 Matthias Clasen <mclasen at redhat.com> - 0.17.7-1
 - Move all patches upstream
 - Pull in new translations