summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2008-06-11 16:13:17 -0400
committerRay Strode <rstrode@redhat.com>2008-06-11 17:19:55 -0400
commit7826d560be7f9703bd743aadb9676f7576092685 (patch)
treef840eb4272b1c686a0fd7bb97706660e0f2eafd6
parent3d6f43ed2655f31d2423f69a89df4e0731d2754f (diff)
downloadplymouth-7826d560be7f9703bd743aadb9676f7576092685.tar.gz
plymouth-7826d560be7f9703bd743aadb9676f7576092685.tar.xz
plymouth-7826d560be7f9703bd743aadb9676f7576092685.zip
Write to stdout instead of tty1 for text plugin
-rw-r--r--src/splash-plugins/text/plugin.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/splash-plugins/text/plugin.c b/src/splash-plugins/text/plugin.c
index 3ad9234..7e8a4e6 100644
--- a/src/splash-plugins/text/plugin.c
+++ b/src/splash-plugins/text/plugin.c
@@ -60,8 +60,6 @@ struct _ply_boot_splash_plugin
{
ply_event_loop_t *loop;
- int console_fd;
-
ply_answer_t *pending_password_answer;
uint32_t keyboard_input_is_hidden : 1;
@@ -75,7 +73,6 @@ create_plugin (void)
ply_trace ("creating plugin");
plugin = calloc (1, sizeof (ply_boot_splash_plugin_t));
- plugin->console_fd = -1;
return plugin;
}
@@ -91,19 +88,6 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
free (plugin);
}
-static bool
-open_console (ply_boot_splash_plugin_t *plugin)
-{
- assert (plugin != NULL);
-
- plugin->console_fd = open ("/dev/tty1", O_RDWR | O_APPEND | O_NOCTTY);
-
- if (plugin->console_fd < 0)
- return false;
-
- return true;
-}
-
static void
detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
{
@@ -165,10 +149,6 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
detach_from_event_loop,
plugin);
- ply_trace ("opening console");
- if (!open_console (plugin))
- return false;
-
return true;
}
@@ -179,7 +159,7 @@ update_status (ply_boot_splash_plugin_t *plugin,
assert (plugin != NULL);
ply_trace ("status update");
- write (plugin->console_fd, ".", 1);
+ write (1, ".", 1);
}
void