rename rhgb-client to plymouth

We'll keep a compat symlink in place until init scripts are moved over

6 files changed, 969 insertions, 0 deletions

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
new file mode 100644
index 0000000..a0f20ee
--- /dev/null
+++ b/src/client/Makefile.am
@@ -0,0 +1,22 @@
+INCLUDES = -I$(top_srcdir)                                                    \
+           -I$(top_srcdir)/src                                                \
+           -I$(top_srcdir)/src/libply                                         \
+           -I$(srcdir)
+plymouthdir = $(bindir)
+plymouth_PROGRAMS = plymouth
+
+plymouth_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(prefix)/\$${LIB}/plymouth/\"
+plymouth_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
+plymouth_SOURCES = \
+                      $(srcdir)/../ply-boot-protocol.h                        \
+                      $(srcdir)/ply-boot-client.h                             \
+                      $(srcdir)/ply-boot-client.c                             \
+                      $(srcdir)/plymouth.c
+
+install-data-hook:
+	(cd $(DESTDIR)$(plymouthdir); ln -s plymouth rhgb-client)
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(plymouthdir)/rhgb-client
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/client/ply-boot-client.c b/src/client/ply-boot-client.c
new file mode 100644
index 0000000..08eb6b9
--- /dev/null
+++ b/src/client/ply-boot-client.c
@@ -0,0 +1,660 @@
+/* ply-boot-client.h - APIs for talking to the boot status daemon
+ *
+ * Copyright (C) 2007 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by: Ray Strode <rstrode@redhat.com>
+ */
+#include "config.h"
+#include "ply-boot-client.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "ply-event-loop.h"
+#include "ply-list.h"
+#include "ply-logger.h"
+#include "ply-utils.h"
+
+struct _ply_boot_client
+{
+  ply_event_loop_t *loop;
+  ply_fd_watch_t *daemon_can_take_request_watch;
+  ply_fd_watch_t *daemon_has_reply_watch;
+  ply_list_t *requests_to_send;
+  ply_list_t *requests_waiting_for_replies;
+  int socket_fd;
+
+  ply_boot_client_disconnect_handler_t disconnect_handler;
+  void *disconnect_handler_user_data;
+
+  uint32_t is_connected : 1;
+};
+
+typedef struct
+{
+  ply_boot_client_t *client;
+  char *command;
+  char *argument;
+  ply_boot_client_response_handler_t handler;
+  ply_boot_client_response_handler_t failed_handler;
+  void *user_data;
+} ply_boot_client_request_t;
+
+static void ply_boot_client_cancel_request (ply_boot_client_t         *client,
+                                            ply_boot_client_request_t *request);
+
+ply_boot_client_t *
+ply_boot_client_new (void)
+{
+  ply_boot_client_t *client;
+
+  client = calloc (1, sizeof (ply_boot_client_t));
+  client->daemon_can_take_request_watch = NULL;
+  client->daemon_has_reply_watch = NULL;
+  client->requests_to_send = ply_list_new ();
+  client->requests_waiting_for_replies = ply_list_new ();
+  client->loop = NULL;
+  client->is_connected = false;
+  client->disconnect_handler = NULL;
+  client->disconnect_handler_user_data = NULL;
+
+  return client;
+}
+
+static void
+ply_boot_client_cancel_unsent_requests (ply_boot_client_t *client)
+{
+  ply_list_node_t *node;
+
+  if (ply_list_get_length (client->requests_to_send) == 0)
+      return;
+
+  node = ply_list_get_first_node (client->requests_to_send);
+  while (node != NULL)
+    {
+      ply_list_node_t *next_node;
+      ply_boot_client_request_t *request;
+
+      request = (ply_boot_client_request_t *) ply_list_node_get_data (node);
+      next_node = ply_list_get_next_node (client->requests_to_send, node);
+
+      ply_boot_client_cancel_request (client, request);
+      ply_list_remove_node (client->requests_to_send, node);
+
+      node = next_node;
+    }
+
+  ply_event_loop_stop_watching_fd (client->loop, 
+                                   client->daemon_can_take_request_watch);
+  client->daemon_can_take_request_watch = NULL;
+}
+
+static void
+ply_boot_client_cancel_requests_waiting_for_replies (ply_boot_client_t *client)
+{
+  ply_list_node_t *node;
+
+  if (ply_list_get_length (client->requests_waiting_for_replies) == 0)
+      return;
+
+  node = ply_list_get_first_node (client->requests_waiting_for_replies);
+  while (node != NULL)
+    {
+      ply_list_node_t *next_node;
+      ply_boot_client_request_t *request;
+
+      request = (ply_boot_client_request_t *) ply_list_node_get_data (node);
+      next_node = ply_list_get_next_node (client->requests_waiting_for_replies, node);
+
+      ply_boot_client_cancel_request (client, request);
+      ply_list_remove_node (client->requests_waiting_for_replies, node);
+
+      node = next_node;
+    }
+
+  ply_event_loop_stop_watching_fd (client->loop, 
+                                   client->daemon_has_reply_watch);
+  client->daemon_has_reply_watch = NULL;
+}
+
+static void
+ply_boot_client_cancel_requests (ply_boot_client_t *client)
+{
+  ply_boot_client_cancel_unsent_requests (client);
+  ply_boot_client_cancel_requests_waiting_for_replies (client);
+}
+
+void
+ply_boot_client_free (ply_boot_client_t *client)
+{
+  if (client == NULL)
+    return;
+
+  ply_boot_client_cancel_requests (client);
+
+  ply_list_free (client->requests_to_send);
+  ply_list_free (client->requests_waiting_for_replies);
+
+  free (client);
+}
+
+bool
+ply_boot_client_connect (ply_boot_client_t *client,
+                         ply_boot_client_disconnect_handler_t  disconnect_handler,
+                         void                                 *user_data)
+{
+  assert (client != NULL);
+  assert (!client->is_connected);
+  assert (client->disconnect_handler == NULL);
+  assert (client->disconnect_handler_user_data == NULL);
+
+  client->socket_fd = 
+      ply_connect_to_unix_socket (PLY_BOOT_PROTOCOL_SOCKET_PATH, true);
+
+  if (client->socket_fd < 0)
+    return false;
+
+  client->disconnect_handler = disconnect_handler;
+  client->disconnect_handler_user_data = user_data;
+
+  client->is_connected = true;
+  return true;
+}
+
+static ply_boot_client_request_t *
+ply_boot_client_request_new (ply_boot_client_t                  *client,
+                             const char                         *request_command,
+                             const char                         *request_argument,
+                             ply_boot_client_response_handler_t  handler,
+                             ply_boot_client_response_handler_t  failed_handler,
+                             void                               *user_data)
+{
+  ply_boot_client_request_t *request;
+
+  assert (client != NULL);
+  assert (request_command != NULL);
+  assert (handler != NULL);
+
+  request = calloc (1, sizeof (ply_boot_client_request_t));
+  request->client = client;
+  request->command = strdup (request_command);
+  if (request_argument != NULL)
+    request->argument = strdup (request_argument);
+  request->handler = handler;
+  request->failed_handler = failed_handler;
+  request->user_data = user_data;
+
+  return request;
+}
+
+static void
+ply_boot_client_request_free (ply_boot_client_request_t *request)
+{
+  if (request == NULL)
+    return;
+  free (request->command);
+  free (request);
+}
+
+static void
+ply_boot_client_cancel_request (ply_boot_client_t         *client,
+                                ply_boot_client_request_t *request)
+{
+  if (request->failed_handler != NULL)
+    request->failed_handler (request->user_data, request->client);
+
+  ply_boot_client_request_free (request);
+}
+
+static void
+ply_boot_client_process_incoming_replies (ply_boot_client_t *client)
+{
+  ply_list_node_t *request_node;
+  ply_boot_client_request_t *request;
+  bool processed_reply;
+  uint8_t byte[2] = "";
+  uint8_t size;
+
+  assert (client != NULL);
+
+  processed_reply = false;
+  if (ply_list_get_length (client->requests_waiting_for_replies) == 0)
+    {
+      ply_error ("received unexpected response from boot status daemon");
+      return;
+    }
+
+  request_node = ply_list_get_first_node (client->requests_waiting_for_replies);
+  assert (request_node != NULL);
+
+  request = (ply_boot_client_request_t *) ply_list_node_get_data (request_node);
+  assert (request != NULL);
+
+  if (!ply_read (client->socket_fd, byte, sizeof (uint8_t)))
+    goto out;
+
+  if (memcmp (byte, PLY_BOOT_PROTOCOL_RESPONSE_TYPE_ACK, sizeof (uint8_t)) == 0)
+      request->handler (request->user_data, client);
+  else if (memcmp (byte, PLY_BOOT_PROTOCOL_RESPONSE_TYPE_ANSWER, sizeof (uint8_t)) == 0)
+    {
+      char answer[257] = "";
+
+      /* FIXME: should make this 4 bytes instead of 1
+       */
+      if (!ply_read (client->socket_fd, &size, sizeof (uint8_t)))
+        goto out;
+
+      if (!ply_read (client->socket_fd, answer, size))
+        goto out;
+
+      ((ply_boot_client_answer_handler_t) request->handler) (request->user_data, answer, client);
+    }
+  else
+    goto out;
+
+  processed_reply = true;
+
+out:
+  if (!processed_reply)
+    {
+      if (request->failed_handler != NULL)
+        request->failed_handler (request->user_data, client);
+    }
+
+  ply_list_remove_node (client->requests_waiting_for_replies, request_node);
+
+  if (ply_list_get_length (client->requests_waiting_for_replies) == 0)
+    {
+      ply_event_loop_stop_watching_fd (client->loop,
+                                       client->daemon_has_reply_watch);
+      client->daemon_has_reply_watch = NULL;
+    }
+}
+
+static char *
+ply_boot_client_get_request_string (ply_boot_client_t         *client,
+                                    ply_boot_client_request_t *request,
+                                    size_t                    *request_size)
+{
+  char *request_string;
+
+  assert (client != NULL);
+  assert (request != NULL);
+  assert (request_size != NULL);
+
+  assert (request->command != NULL);
+
+  if (request->argument == NULL)
+    {
+      request_string = strdup (request->command);
+      *request_size = strlen (request_string) + 1;
+      return request_string;
+    }
+
+  assert (strlen (request->argument) <= UCHAR_MAX);
+
+  request_string = NULL;
+  asprintf (&request_string, "%s\002%c%s", request->command, 
+            (char) (strlen (request->argument) + 1), request->argument);
+  *request_size = strlen (request_string) + 1;
+
+  return request_string;
+}
+
+static bool
+ply_boot_client_send_request (ply_boot_client_t         *client,
+                              ply_boot_client_request_t *request)
+{
+  char *request_string;
+  size_t request_size;
+
+  assert (client != NULL);
+  assert (request != NULL);
+
+  request_string = ply_boot_client_get_request_string (client, request,
+                                                       &request_size);
+  if (!ply_write (client->socket_fd, request_string, request_size))
+    {
+      free (request_string);
+      ply_boot_client_cancel_request (client, request);
+      return false;
+    }
+  free (request_string);
+
+  if (client->daemon_has_reply_watch == NULL)
+    {
+      assert (ply_list_get_length (client->requests_waiting_for_replies) == 0);
+      client->daemon_has_reply_watch = 
+          ply_event_loop_watch_fd (client->loop, client->socket_fd,
+                                   PLY_EVENT_LOOP_FD_STATUS_HAS_DATA,
+                                   (ply_event_handler_t)
+                                   ply_boot_client_process_incoming_replies,
+                                   NULL, client);
+    }
+  return true;
+}
+
+static void
+ply_boot_client_process_pending_requests (ply_boot_client_t *client)
+{
+  ply_list_node_t *request_node;
+  ply_boot_client_request_t *request;
+
+  assert (ply_list_get_length (client->requests_to_send) != 0);
+  assert (client->daemon_can_take_request_watch != NULL);
+
+  request_node = ply_list_get_first_node (client->requests_to_send);
+  assert (request_node != NULL);
+
+  request = (ply_boot_client_request_t *) ply_list_node_get_data (request_node);
+  assert (request != NULL);
+
+  ply_list_remove_node (client->requests_to_send, request_node);
+
+  if (ply_boot_client_send_request (client, request))
+    ply_list_append_data (client->requests_waiting_for_replies, request);
+
+  if (ply_list_get_length (client->requests_to_send) == 0)
+    {
+      ply_event_loop_stop_watching_fd (client->loop,
+                                       client->daemon_can_take_request_watch);
+      client->daemon_can_take_request_watch = NULL;
+    }
+}
+
+static void
+ply_boot_client_queue_request (ply_boot_client_t                  *client,
+                               const char                         *request_command,
+                               const char                         *request_argument,
+                               ply_boot_client_response_handler_t  handler,
+                               ply_boot_client_response_handler_t  failed_handler,
+                               void                               *user_data)
+{
+  ply_boot_client_request_t *request;
+
+  assert (client != NULL);
+  assert (client->loop != NULL);
+  assert (client->socket_fd >= 0);
+  assert (request_command != NULL);
+  assert (request_argument == NULL || strlen (request_argument) <= UCHAR_MAX);
+  assert (handler != NULL);
+
+  if (client->daemon_can_take_request_watch == NULL)
+    {
+      assert (ply_list_get_length (client->requests_to_send) == 0);
+      client->daemon_can_take_request_watch = 
+          ply_event_loop_watch_fd (client->loop, client->socket_fd,
+                                   PLY_EVENT_LOOP_FD_STATUS_CAN_TAKE_DATA,
+                                   (ply_event_handler_t)
+                                   ply_boot_client_process_pending_requests,
+                                   NULL, client);
+    }
+
+  request = ply_boot_client_request_new (client, request_command,
+                                         request_argument, 
+                                         handler, failed_handler, user_data);
+  ply_list_append_data (client->requests_to_send, request);
+}
+
+void
+ply_boot_client_ping_daemon (ply_boot_client_t                  *client,
+                             ply_boot_client_response_handler_t  handler,
+                             ply_boot_client_response_handler_t  failed_handler,
+                             void                               *user_data)
+{
+  assert (client != NULL);
+
+  ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_PING,
+                                 NULL, handler, failed_handler, user_data);
+}
+
+void
+ply_boot_client_update_daemon (ply_boot_client_t                  *client,
+                               const char                         *status,
+                               ply_boot_client_response_handler_t  handler,
+                               ply_boot_client_response_handler_t  failed_handler,
+                               void                               *user_data)
+{
+  assert (client != NULL);
+
+  ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_UPDATE,
+                                 status, handler, failed_handler, user_data);
+}
+
+void
+ply_boot_client_tell_daemon_system_is_initialized (ply_boot_client_t                  *client,
+                                                   ply_boot_client_response_handler_t  handler,
+                                                   ply_boot_client_response_handler_t  failed_handler,
+                                                   void                               *user_data)
+{
+  assert (client != NULL);
+
+  ply_boot_client_queue_request (client,
+                                 PLY_BOOT_PROTOCOL_REQUEST_TYPE_SYSTEM_INITIALIZED,
+                                 NULL, handler, failed_handler, user_data);
+}
+
+void
+ply_boot_client_ask_daemon_for_password (ply_boot_client_t                  *client,
+                                         ply_boot_client_answer_handler_t    handler,
+                                         ply_boot_client_response_handler_t  failed_handler,
+                                         void                               *user_data)
+{
+  assert (client != NULL);
+
+  ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_PASSWORD,
+                                 NULL, (ply_boot_client_response_handler_t)
+                                 handler, failed_handler, user_data);
+}
+
+void
+ply_boot_client_tell_daemon_to_quit (ply_boot_client_t                  *client,
+                                     ply_boot_client_response_handler_t  handler,
+                                     ply_boot_client_response_handler_t  failed_handler,
+                                     void                               *user_data)
+{
+  assert (client != NULL);
+
+  ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_QUIT,
+                                 NULL, handler, failed_handler, user_data);
+}
+
+void
+ply_boot_client_disconnect (ply_boot_client_t *client)
+{
+  assert (client != NULL);
+
+  close (client->socket_fd);
+  client->socket_fd = -1;
+  client->is_connected = false;
+}
+
+static void
+ply_boot_client_detach_from_event_loop (ply_boot_client_t *client)
+{
+  assert (client != NULL);
+  client->loop = NULL;
+}
+
+static void
+ply_boot_client_on_hangup (ply_boot_client_t *client)
+{
+  assert (client != NULL);
+  ply_boot_client_cancel_requests (client);
+
+  if (client->disconnect_handler != NULL)
+    client->disconnect_handler (client->disconnect_handler_user_data,
+                                client);
+}
+
+void
+ply_boot_client_attach_to_event_loop (ply_boot_client_t *client,
+                                      ply_event_loop_t  *loop)
+{
+  assert (client != NULL);
+  assert (loop != NULL);
+  assert (client->loop == NULL);
+  assert (client->socket_fd >= 0);
+
+  client->loop = loop;
+
+  ply_event_loop_watch_fd (client->loop, client->socket_fd,
+                           PLY_EVENT_LOOP_FD_STATUS_NONE,
+                           NULL, 
+                           (ply_event_handler_t) ply_boot_client_on_hangup,
+                           client);
+
+  ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t) 
+                                 ply_boot_client_detach_from_event_loop,
+                                 client); 
+
+}
+
+#ifdef PLY_BOOT_CLIENT_ENABLE_TEST
+
+#include <stdio.h>
+
+#include "ply-event-loop.h"
+#include "ply-boot-client.h"
+
+static void
+on_pinged (ply_event_loop_t *loop)
+{
+  printf ("PING!\n");
+}
+
+static void
+on_ping_failed (ply_event_loop_t *loop)
+{
+  printf ("PING FAILED! %m\n");
+  ply_event_loop_exit (loop, 1);
+}
+
+static void
+on_update (ply_event_loop_t *loop)
+{
+  printf ("UPDATE!\n");
+}
+
+static void
+on_update_failed (ply_event_loop_t *loop)
+{
+  printf ("UPDATE FAILED! %m\n");
+  ply_event_loop_exit (loop, 1);
+}
+
+static void
+on_system_initialized (ply_event_loop_t *loop)
+{
+  printf ("SYSTEM INITIALIZED!\n");
+}
+
+static void
+on_system_initialized_failed (ply_event_loop_t *loop)
+{
+  printf ("SYSTEM INITIALIZATION REQUEST FAILED!\n");
+  ply_event_loop_exit (loop, 1);
+}
+
+static void
+on_quit (ply_event_loop_t *loop)
+{
+  printf ("QUIT!\n");
+  ply_event_loop_exit (loop, 0);
+}
+
+static void
+on_quit_failed (ply_event_loop_t *loop)
+{
+  printf ("QUIT FAILED! %m\n");
+  ply_event_loop_exit (loop, 2);
+}
+
+static void
+on_disconnect (ply_event_loop_t *loop)
+{
+  printf ("DISCONNECT!\n");
+  ply_event_loop_exit (loop, 1);
+}
+
+int
+main (int    argc,
+      char **argv)
+{
+  ply_event_loop_t *loop;
+  ply_boot_client_t *client;
+  int exit_code;
+
+  exit_code = 0;
+
+  loop = ply_event_loop_new ();
+
+  client = ply_boot_client_new ();
+
+  if (!ply_boot_client_connect (client, 
+                                (ply_boot_client_disconnect_handler_t) on_disconnect,
+                                loop))
+    {
+      perror ("could not start boot client");
+      return errno;
+    }
+
+  ply_boot_client_attach_to_event_loop (client, loop);
+  ply_boot_client_ping_daemon (client, 
+                               (ply_boot_client_response_handler_t) on_pinged,
+                               (ply_boot_client_response_handler_t) on_ping_failed,
+                               loop);
+
+  ply_boot_client_update_daemon (client, 
+                                 "loading",
+                                 (ply_boot_client_response_handler_t) on_update,
+                                 (ply_boot_client_response_handler_t) on_update_failed,
+                                 loop);
+
+  ply_boot_client_update_daemon (client, 
+                                 "loading more",
+                                 (ply_boot_client_response_handler_t) on_update,
+                                 (ply_boot_client_response_handler_t) on_update_failed,
+                                 loop);
+
+  ply_boot_client_tell_daemon_system_is_initialized (client, 
+                                       (ply_boot_client_response_handler_t) 
+                                       on_system_initialized,
+                                       (ply_boot_client_response_handler_t) 
+                                       on_system_initialized_failed,
+                                       loop);
+
+  ply_boot_client_tell_daemon_to_quit (client, 
+                                       (ply_boot_client_response_handler_t) on_quit,
+                                       (ply_boot_client_response_handler_t) on_quit_failed,
+                                       loop);
+
+  exit_code = ply_event_loop_run (loop);
+
+  ply_boot_client_free (client);
+
+  return exit_code;
+}
+
+#endif /* PLY_BOOT_CLIENT_ENABLE_TEST */
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/client/ply-boot-client.h b/src/client/ply-boot-client.h
new file mode 100644
index 0000000..4c72db2
--- /dev/null
+++ b/src/client/ply-boot-client.h
@@ -0,0 +1,77 @@
+/* ply-boot-client.h - APIs for talking to the boot status daemon
+ *
+ * Copyright (C) 2007 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written By: Ray Strode <rstrode@redhat.com>
+ */
+#ifndef PLY_BOOT_CLIENT_H
+#define PLY_BOOT_CLIENT_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include "ply-boot-protocol.h"
+#include "ply-event-loop.h"
+
+typedef struct _ply_boot_client ply_boot_client_t;
+typedef void (* ply_boot_client_response_handler_t) (void              *user_data,
+                                                     ply_boot_client_t *client);
+typedef void (* ply_boot_client_answer_handler_t) (void              *user_data,
+                                                   const char        *answer,
+                                                   ply_boot_client_t *client);
+typedef void (* ply_boot_client_disconnect_handler_t) (void              *user_data,
+                                                       ply_boot_client_t *client);
+
+#ifndef PLY_HIDE_FUNCTION_DECLARATIONS
+ply_boot_client_t *ply_boot_client_new (void);
+                                                  
+void ply_boot_client_free (ply_boot_client_t *client);
+bool ply_boot_client_connect (ply_boot_client_t                    *client,
+                              ply_boot_client_disconnect_handler_t  disconnect_handler,
+                              void                                 *user_data);
+void ply_boot_client_ping_daemon (ply_boot_client_t                  *client,
+                                  ply_boot_client_response_handler_t  handler,
+                                  ply_boot_client_response_handler_t  failed_handler,
+                                  void                               *user_data);
+void ply_boot_client_update_daemon (ply_boot_client_t                  *client,
+                                    const char                         *new_status,
+                                    ply_boot_client_response_handler_t  handler,
+                                    ply_boot_client_response_handler_t  failed_handler,
+                                    void                               *user_data);
+void ply_boot_client_ask_daemon_for_password (ply_boot_client_t                  *client,
+                                         ply_boot_client_answer_handler_t    handler,
+                                         ply_boot_client_response_handler_t  failed_handler,
+                                         void                               *user_data);
+void ply_boot_client_tell_daemon_system_is_initialized (ply_boot_client_t                  *client,
+                                                        ply_boot_client_response_handler_t  handler,
+                                                        ply_boot_client_response_handler_t  failed_handler,
+                                                        void                               *user_data);
+void ply_boot_client_tell_daemon_to_quit (ply_boot_client_t                  *client,
+                                          ply_boot_client_response_handler_t  handler,
+                                          ply_boot_client_response_handler_t  failed_handler,
+                                          void                               *user_data);
+
+void ply_boot_client_disconnect (ply_boot_client_t *client);
+void ply_boot_client_attach_to_event_loop (ply_boot_client_t *client,
+                                           ply_event_loop_t  *loop);
+
+#endif
+
+#endif /* PLY_BOOT_CLIENT_H */
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/client/plymouth.c b/src/client/plymouth.c
new file mode 100644
index 0000000..048563d
--- /dev/null
+++ b/src/client/plymouth.c
@@ -0,0 +1,184 @@
+/* rhgb-client.c - updates boot status
+ *
+ * Copyright (C) 2007 Red Hat, Inc
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this; see the file COPYING.  If not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by: Ray Strode <rstrode@redhat.com>
+ */
+#include "config.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#include "ply-boot-client.h"
+#include "ply-event-loop.h"
+#include "ply-logger.h"
+#include "ply-utils.h"
+
+static void
+on_answer (ply_event_loop_t *loop,
+           const char       *answer)
+{
+  write (STDOUT_FILENO, answer, strlen (answer));
+  ply_event_loop_exit (loop, 0);
+}
+
+static void
+on_success (ply_event_loop_t *loop)
+{
+  ply_event_loop_exit (loop, 0);
+}
+
+static void
+on_failure (ply_event_loop_t *loop)
+{
+  ply_event_loop_exit (loop, 1);
+}
+
+static void
+on_disconnect (ply_event_loop_t *loop)
+{
+  ply_error ("error: unexpectedly disconnected from boot status daemon");
+  ply_event_loop_exit (loop, 2);
+}
+
+void
+print_usage (void)
+{
+  ply_log ("rhgb-client [--ping] [--update=STATUS] [--details] [--sysinit] [--quit]");
+  ply_flush_log ();
+}
+
+int
+main (int    argc,
+      char **argv)
+{
+  ply_event_loop_t *loop;
+  ply_boot_client_t *client;
+  bool should_quit, should_ping, should_update, should_sysinit, should_ask_for_password;
+  char *status;
+  int exit_code;
+  int i;
+
+  exit_code = 0;
+
+  if (argc <= 1)
+    {
+      print_usage ();
+      return 1;
+    }
+
+  loop = ply_event_loop_new ();
+  client = ply_boot_client_new ();
+
+  should_ping = false;
+  should_update = false;
+  should_quit = false;
+  should_ask_for_password = false;
+  status = NULL;
+  for (i = 1; i < argc; i++)
+    {
+      if (strstr (argv[i], "--help") != NULL)
+        {
+          print_usage ();
+          return 1;
+        }
+      if (strstr (argv[i], "--quit") != NULL)
+        should_quit = true;
+      else if (strstr (argv[i], "--ping") != NULL)
+        should_ping = true;
+      else if (strstr (argv[i], "--sysinit") != NULL)
+        should_sysinit = true;
+      else if (strstr (argv[i], "--ask-for-password") != NULL)
+        should_ask_for_password = true;
+      else if (strstr (argv[i], "--update") != NULL)
+        {
+          const char *update_argument;
+          should_update = true;
+          update_argument = strstr (argv[i], "--update") + strlen ("--update");
+
+          if (update_argument[0] == '\0')
+            {
+              print_usage ();
+              return 1;
+            }
+          status = strdup (update_argument + 1);
+        }
+    }
+
+  if (!ply_boot_client_connect (client, 
+                                (ply_boot_client_disconnect_handler_t)
+                                on_disconnect, loop))
+    {
+      if (should_ping)
+         return 1;
+
+#if 0
+      ply_save_errno ();
+
+      if (errno == ECONNREFUSED)
+        ply_error ("error: boot status daemon not running "
+                   "(use --ping to check ahead of time)");
+      else
+        ply_error ("could not connect to boot status daemon: %m");
+      ply_restore_errno ();
+#endif
+      return errno;
+    }
+
+  ply_boot_client_attach_to_event_loop (client, loop);
+
+  if (should_quit)
+    ply_boot_client_tell_daemon_to_quit (client,
+                                         (ply_boot_client_response_handler_t)
+                                         on_success,
+                                         (ply_boot_client_response_handler_t)
+                                         on_failure, loop);
+  else if (should_ping)
+    ply_boot_client_ping_daemon (client, 
+                                 (ply_boot_client_response_handler_t)
+                                 on_success, 
+                                 (ply_boot_client_response_handler_t)
+                                 on_failure, loop);
+  else if (should_update)
+    ply_boot_client_update_daemon (client, status,
+                                   (ply_boot_client_response_handler_t)
+                                   on_success, 
+                                   (ply_boot_client_response_handler_t)
+                                   on_failure, loop);
+  else if (should_ask_for_password)
+    ply_boot_client_ask_daemon_for_password (client,
+                                   (ply_boot_client_answer_handler_t)
+                                   on_answer,
+                                   (ply_boot_client_response_handler_t)
+                                   on_failure, loop);
+  else if (should_sysinit)
+    ply_boot_client_tell_daemon_system_is_initialized (client,
+                                   (ply_boot_client_response_handler_t)
+                                   on_success, 
+                                   (ply_boot_client_response_handler_t)
+                                   on_failure, loop);
+  else
+    return 1;
+
+  exit_code = ply_event_loop_run (loop);
+
+  ply_boot_client_free (client);
+
+  return exit_code;
+}
+/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
diff --git a/src/client/tests/Makefile.am b/src/client/tests/Makefile.am
new file mode 100644
index 0000000..c6dbfdb
--- /dev/null
+++ b/src/client/tests/Makefile.am
@@ -0,0 +1,10 @@
+INCLUDES =                                                                    \
+           -I$(top_srcdir)                                                    \
+           -I$(srcdir)/..                                                     \
+           -I$(srcdir)/../..                                                  \
+           -I$(srcdir)
+TESTS = 
+
+noinst_PROGRAMS = $(TESTS)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/client/tests/ply-boot-client-test.am b/src/client/tests/ply-boot-client-test.am
new file mode 100644
index 0000000..f733032
--- /dev/null
+++ b/src/client/tests/ply-boot-client-test.am
@@ -0,0 +1,16 @@
+TESTS += ply-boot-client-test
+
+ply_boot_client_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_BOOT_CLIENT_ENABLE_TEST
+ply_boot_client_test_LDADD = $(PLYMOUTH_LIBS)
+
+ply_boot_client_test_SOURCES =                                                \
+                          $(srcdir)/../ply-utils.h                            \
+                          $(srcdir)/../ply-utils.c                            \
+                          $(srcdir)/../ply-logger.h                           \
+                          $(srcdir)/../ply-logger.c                           \
+                          $(srcdir)/../ply-list.h                             \
+                          $(srcdir)/../ply-list.c                             \
+                          $(srcdir)/../ply-event-loop.h                       \
+                          $(srcdir)/../ply-event-loop.c                       \
+                          $(srcdir)/../ply-boot-client.h                      \
+                          $(srcdir)/../ply-boot-client.c