File correct-order-of-compose-and-key-map.patch of Package systemd.1059

Overview Repositories Revisions Requests Users Attributes Meta

File correct-order-of-compose-and-key-map.patch of Package systemd.1059

---
 src/vconsole/vconsole-setup.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- src/vconsole/vconsole-setup.c
+++ src/vconsole/vconsole-setup.c	2015-09-02 13:30:27.233518894 +0000
@@ -487,25 +487,25 @@ finish:
         if (font_pid > 0)
                 wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
 
-#ifdef HAVE_SYSV_COMPAT
-        r = load_compose_table(vc, vc_compose_table, &compose_table_pid);
+        r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, disable_capslock, &keymap_pid);
         if (r < 0) {
                 log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
                 return EXIT_FAILURE;
         }
 
-        if (compose_table_pid > 0)
-                wait_for_terminate_and_warn(KBD_LOADKEYS, compose_table_pid);
-#endif
+        if (keymap_pid > 0)
+                wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
 
-        r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, disable_capslock, &keymap_pid);
+#ifdef HAVE_SYSV_COMPAT
+        r = load_compose_table(vc, vc_compose_table, &compose_table_pid);
         if (r < 0) {
                 log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
                 return EXIT_FAILURE;
         }
 
-        if (keymap_pid > 0)
-                wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
+        if (compose_table_pid > 0)
+                wait_for_terminate_and_warn(KBD_LOADKEYS, compose_table_pid);
+#endif
 
 #ifdef HAVE_SYSV_COMPAT
         if (numlock)

Places

File correct-order-of-compose-and-key-map.patch of Package systemd.1059

Places