93 lines
3.3 KiB
Diff
93 lines
3.3 KiB
Diff
From 20a575e8935cf5d2d078bbe3acf21fff56f2345c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Tue, 1 Jul 2014 22:20:11 -0400
|
|
Subject: [PATCH] vconsole-setup: run setfont before loadkeys
|
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=80685
|
|
(cherry picked from commit abee28c56d523e55751b0c007d0bf812cc285c00)
|
|
---
|
|
src/vconsole/vconsole-setup.c | 48 +++++++++++++++++++++----------------------
|
|
1 file changed, 23 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
|
|
index e0c4050611..25d15afd5c 100644
|
|
--- a/src/vconsole/vconsole-setup.c
|
|
+++ b/src/vconsole/vconsole-setup.c
|
|
@@ -238,12 +238,10 @@ static void font_copy_to_all_vcs(int fd) {
|
|
|
|
int main(int argc, char **argv) {
|
|
const char *vc;
|
|
- char *vc_keymap = NULL;
|
|
- char *vc_keymap_toggle = NULL;
|
|
- char *vc_font = NULL;
|
|
- char *vc_font_map = NULL;
|
|
- char *vc_font_unimap = NULL;
|
|
- int fd = -1;
|
|
+ _cleanup_free_ char
|
|
+ *vc_keymap = NULL, *vc_keymap_toggle = NULL,
|
|
+ *vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL;
|
|
+ _cleanup_close_ int fd = -1;
|
|
bool utf8;
|
|
pid_t font_pid = 0, keymap_pid = 0;
|
|
bool font_copy = false;
|
|
@@ -265,12 +263,12 @@ int main(int argc, char **argv) {
|
|
fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
|
|
if (fd < 0) {
|
|
log_error("Failed to open %s: %m", vc);
|
|
- goto finish;
|
|
+ return EXIT_FAILURE;
|
|
}
|
|
|
|
if (!is_vconsole(fd)) {
|
|
log_error("Device %s is not a virtual console.", vc);
|
|
- goto finish;
|
|
+ return EXIT_FAILURE;
|
|
}
|
|
|
|
utf8 = is_locale_utf8();
|
|
@@ -305,27 +303,27 @@ int main(int argc, char **argv) {
|
|
else
|
|
disable_utf8(fd);
|
|
|
|
- r = EXIT_FAILURE;
|
|
- if (keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
|
|
- font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
|
|
- r = EXIT_SUCCESS;
|
|
-
|
|
-finish:
|
|
- if (keymap_pid > 0)
|
|
- wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
|
|
+ r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
|
|
+ if (r < 0) {
|
|
+ log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
|
|
+ return EXIT_FAILURE;
|
|
+ }
|
|
|
|
- if (font_pid > 0) {
|
|
+ if (font_pid > 0)
|
|
wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
|
|
- if (font_copy)
|
|
- font_copy_to_all_vcs(fd);
|
|
+
|
|
+ r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
|
|
+ if (r < 0) {
|
|
+ log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r));
|
|
+ return EXIT_FAILURE;
|
|
}
|
|
|
|
- free(vc_keymap);
|
|
- free(vc_font);
|
|
- free(vc_font_map);
|
|
- free(vc_font_unimap);
|
|
+ if (keymap_pid > 0)
|
|
+ wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
|
|
|
|
- safe_close(fd);
|
|
+ /* Only copy the font when we started setfont successfully */
|
|
+ if (font_copy && font_pid > 0)
|
|
+ font_copy_to_all_vcs(fd);
|
|
|
|
- return r;
|
|
+ return EXIT_SUCCESS;
|
|
}
|