From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 31 Jul 2013 21:12:17 +0000 (+0200)
Subject: Add /usr/share/keymaps to localectl supported locations.
X-Git-Tag: v207~205
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4a9e80b3b5d0d3c0cabac01c35db18d95f27c9c1;p=elogind.git

Add /usr/share/keymaps to localectl supported locations.

This is the standard upstream location where kbd installs keymaps.
---

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index cd7356a1e..8259c0af5 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -538,6 +538,7 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
         if (!keymaps)
                 return log_oom();
 
+        nftw("/usr/share/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
         nftw("/usr/share/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
         nftw("/usr/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);
         nftw("/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS);