From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 4 Mar 2021 09:50:32 +0000 (+0100)
Subject: shared/kbd-util: return error on resource errors
X-Git-Tag: v248-rc3~50^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d230090c3545cfbc40f2377a22c11c383d56d45;p=thirdparty%2Fsystemd.git

shared/kbd-util: return error on resource errors

I guess we should still not fail on failure to access a directory and such.
---

diff --git a/src/shared/kbd-util.c b/src/shared/kbd-util.c
index fb98dd262e8..f5669f7c03d 100644
--- a/src/shared/kbd-util.c
+++ b/src/shared/kbd-util.c
@@ -2,6 +2,7 @@
 
 #include <ftw.h>
 
+#include "errno-util.h"
 #include "kbd-util.h"
 #include "log.h"
 #include "nulstr-util.h"
@@ -62,8 +63,13 @@ int get_keymaps(char ***ret) {
         const char *dir;
         NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS)
                 if (nftw(dir, nftw_cb, 20, FTW_PHYS) < 0) {
-                        if (errno != ENOENT)
-                                log_debug_errno(errno, "Failed to read keymap list from %s, ignoring: %m", dir);
+                        if (errno == ENOENT)
+                                continue;
+                        if (ERRNO_IS_RESOURCE(errno)) {
+                                keymaps = set_free_free(keymaps);
+                                return log_warning_errno(errno, "Failed to read keymap list from %s: %m", dir);
+                        }
+                        log_debug_errno(errno, "Failed to read keymap list from %s, ignoring: %m", dir);
                 }
 
         _cleanup_strv_free_ char **l = set_get_strv(keymaps);