summaryrefslogtreecommitdiff
path: root/src/libply-splash-core
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2010-05-07 14:49:09 -0400
committerRay Strode <rstrode@redhat.com>2010-05-07 14:49:09 -0400
commit8c390bea97ccd2c0f74f63fd90d549dd4f488651 (patch)
tree213ca6525433d4650c97f51f8f285f4c8a70221d /src/libply-splash-core
parent2ea21378ef2187858440594698e13300381f3fda (diff)
[terminal] Don't stomp over original tty lock settings
We were repetedly saving over the original tty lock settings, causing the tty to stay locked after boot up.
Diffstat (limited to 'src/libply-splash-core')
-rw-r--r--src/libply-splash-core/ply-terminal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
index f71f25af..ff59d719 100644
--- a/src/libply-splash-core/ply-terminal.c
+++ b/src/libply-splash-core/ply-terminal.c
@@ -188,7 +188,8 @@ ply_terminal_set_unbuffered_input (ply_terminal_t *terminal)
if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0)
return false;
- if (ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
+ if (!terminal->original_locked_term_attributes_saved &&
+ ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
{
terminal->original_locked_term_attributes = locked_term_attributes;
terminal->original_locked_term_attributes_saved = true;