nspawn: create empty /etc/resolv.conf if necessary

[elogind.git] / src / locale / localectl.c

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 095d7f7d3f7184dea82f48f32685a0628e06c48d..ea9187ff840a1dee493c6156f4e9cee3d9c9a1d6 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -387,7 +387,7 @@ static int add_locales_from_archive(Set *locales) {
 }
 
 static int add_locales_from_libdir (Set *locales) {
-        DIR _cleanup_closedir_ *dir;
+        _cleanup_closedir_ DIR *dir;
         struct dirent *entry;
         int r;
 
@@ -539,7 +539,7 @@ static int nftw_cb(
 }
 
 static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
-        char _cleanup_strv_free_ **l = NULL;
+        _cleanup_strv_free_ char **l = NULL;
 
         keymaps = set_new(string_hash_func, string_compare_func);
         if (!keymaps)
@@ -611,7 +611,7 @@ static int set_x11_keymap(DBusConnection *bus, char **args, unsigned n) {
 
 static int list_x11_keymaps(DBusConnection *bus, char **args, unsigned n) {
         _cleanup_fclose_ FILE *f = NULL;
-        char _cleanup_strv_free_ **list = NULL;
+        _cleanup_strv_free_ char **list = NULL;
         char line[LINE_MAX];
         enum {
                 NONE,
@@ -627,7 +627,7 @@ static int list_x11_keymaps(DBusConnection *bus, char **args, unsigned n) {
                 return -EINVAL;
         }
 
-        f = fopen("/usr/share/X11/xkb/rules/xorg.lst", "re");
+        f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
         if (!f) {
                 log_error("Failed to open keyboard mapping list. %m");
                 return -errno;