daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4cad4c
From 1599be6d3625700ded28108c0747b000448fa5dc Mon Sep 17 00:00:00 2001
4cad4c
From: Yu Watanabe <watanabe.yu+github@gmail.com>
4cad4c
Date: Wed, 19 Sep 2018 10:54:16 +0900
4cad4c
Subject: [PATCH] test: add paths of keymaps in install_keymaps()
4cad4c
4cad4c
It seems that the paths of directories storing keymaps are changed.
4cad4c
4cad4c
(cherry picked from commit 83a7051ee1edbfe8cd2278477d23083beb385409)
4cad4c
4cad4c
Resolves: #1823767
4cad4c
---
4cad4c
 test/test-functions | 6 +++++-
4cad4c
 1 file changed, 5 insertions(+), 1 deletion(-)
4cad4c
4cad4c
diff --git a/test/test-functions b/test/test-functions
4cad4c
index 4d76ed1f82..546928c516 100644
4cad4c
--- a/test/test-functions
4cad4c
+++ b/test/test-functions
4cad4c
@@ -619,10 +619,14 @@ install_pam() {
4cad4c
 }
4cad4c
 
4cad4c
 install_keymaps() {
4cad4c
+    # The first three paths may be deprecated.
4cad4c
+    # It seems now the last two paths are used by many distributions.
4cad4c
     for i in \
4cad4c
         /usr/lib/kbd/keymaps/include/* \
4cad4c
         /usr/lib/kbd/keymaps/i386/include/* \
4cad4c
-        /usr/lib/kbd/keymaps/i386/qwerty/us.*; do
4cad4c
+        /usr/lib/kbd/keymaps/i386/qwerty/us.* \
4cad4c
+        /usr/lib/kbd/keymaps/legacy/include/* \
4cad4c
+        /usr/lib/kbd/keymaps/legacy/i386/qwerty/us.*; do
4cad4c
             [[ -f $i ]] || continue
4cad4c
             inst $i
4cad4c
     done