diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-06-27 14:20:56 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2008-06-27 14:20:56 -0400 |
| commit | c46f2a10a707f3386d17aec9da0ab304615f8230 (patch) | |
| tree | 5d33d904008095c2bea9205b2ce7ff94d24f02e2 /src/client | |
| parent | f1378a5218bc7a89d7acadcd2089bb18413cd693 (diff) | |
Add --hide-splash option
We want to be able to hide the splash screen in the event
the user needs to interact with start up from the console.
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ply-boot-client.c | 12 | ||||
| -rw-r--r-- | src/client/ply-boot-client.h | 4 | ||||
| -rw-r--r-- | src/client/plymouth.c | 10 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/client/ply-boot-client.c b/src/client/ply-boot-client.c index e75309d..7604e27 100644 --- a/src/client/ply-boot-client.c +++ b/src/client/ply-boot-client.c @@ -497,6 +497,18 @@ ply_boot_client_tell_daemon_to_show_splash (ply_boot_client_t * } void +ply_boot_client_tell_daemon_to_hide_splash (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_HIDE_SPLASH, + NULL, 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, diff --git a/src/client/ply-boot-client.h b/src/client/ply-boot-client.h index 8ee6718..2142691 100644 --- a/src/client/ply-boot-client.h +++ b/src/client/ply-boot-client.h @@ -71,6 +71,10 @@ void ply_boot_client_tell_daemon_to_show_splash (ply_boot_client_t 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_hide_splash (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, diff --git a/src/client/plymouth.c b/src/client/plymouth.c index f5a201b..56be753 100644 --- a/src/client/plymouth.c +++ b/src/client/plymouth.c @@ -72,7 +72,7 @@ main (int argc, ply_event_loop_t *loop; ply_boot_client_t *client; ply_command_parser_t *command_parser; - bool should_help, should_quit, should_ping, should_sysinit, should_ask_for_password, should_show_splash; + bool should_help, should_quit, should_ping, should_sysinit, should_ask_for_password, should_show_splash, should_hide_splash; char *status, *chroot_dir; int exit_code; @@ -95,6 +95,7 @@ main (int argc, "ping", "Check of boot daemon is running", PLY_COMMAND_OPTION_TYPE_FLAG, "sysinit", "Tell boot daemon root filesystem is mounted read-write", PLY_COMMAND_OPTION_TYPE_FLAG, "show-splash", "Show splash screen", PLY_COMMAND_OPTION_TYPE_FLAG, + "hide-splash", "Hide splash screen", PLY_COMMAND_OPTION_TYPE_FLAG, "ask-for-password", "Ask user for password", PLY_COMMAND_OPTION_TYPE_FLAG, "update", "Tell boot daemon an update about boot progress", PLY_COMMAND_OPTION_TYPE_STRING, NULL); @@ -118,6 +119,7 @@ main (int argc, "ping", &should_ping, "sysinit", &should_sysinit, "show-splash", &should_show_splash, + "hide-splash", &should_hide_splash, "ask-for-password", &should_ask_for_password, "update", &status, NULL); @@ -162,6 +164,12 @@ main (int argc, on_success, (ply_boot_client_response_handler_t) on_failure, loop); + else if (should_hide_splash) + ply_boot_client_tell_daemon_to_hide_splash (client, + (ply_boot_client_response_handler_t) + on_success, + (ply_boot_client_response_handler_t) + on_failure, loop); else if (should_quit) ply_boot_client_tell_daemon_to_quit (client, (ply_boot_client_response_handler_t) |