summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-09-19 10:54:16 +0900
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2020-04-21 10:45:41 +0200
commit1599be6d3625700ded28108c0747b000448fa5dc (patch)
tree9f37f056e43015dc9da2cf32f0fc082cb6d59434
parente39c4e6aee6c2ece5d9b51cc0e7a772016546f5a (diff)
downloadsystemd-1599be6d3625700ded28108c0747b000448fa5dc.tar.gz
test: add paths of keymaps in install_keymaps()
It seems that the paths of directories storing keymaps are changed. (cherry picked from commit 83a7051ee1edbfe8cd2278477d23083beb385409) Resolves: #1823767
-rw-r--r--test/test-functions6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions
index 4d76ed1f82..546928c516 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -619,10 +619,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