From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 Sep 2018 01:54:16 +0000 (+0900)
Subject: test: add paths of keymaps in install_keymaps()
X-Git-Tag: v240~596^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83a7051ee1edbfe8cd2278477d23083beb385409;p=thirdparty%2Fsystemd.git

test: add paths of keymaps in install_keymaps()

It seems that the paths of directories storing keymaps are changed.
---

diff --git a/test/test-functions b/test/test-functions
index 66f60f460fe..dc3b06e22ea 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -623,10 +623,14 @@ install_pam() {
 }
 
 install_keymaps() {
+    # The first three paths may be deprecated.
+    # It seems now the last two paths are used by many distributions.
     for i in \
         /usr/lib/kbd/keymaps/include/* \
         /usr/lib/kbd/keymaps/i386/include/* \
-        /usr/lib/kbd/keymaps/i386/qwerty/us.*; do
+        /usr/lib/kbd/keymaps/i386/qwerty/us.* \
+        /usr/lib/kbd/keymaps/legacy/include/* \
+        /usr/lib/kbd/keymaps/legacy/i386/qwerty/us.*; do
             [[ -f $i ]] || continue
             inst $i
     done