X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fvconsole-setup.c;h=7703361e33ef6029f372a04006d1806fe989a452;hp=047a153b87d38b877eceabd8dae83c3063e5a46a;hb=dd36de4d520fc77f0e2ea83f560040d36be3ee50;hpb=915d22e4f09e8f6d7fb2e7a7456f8b5908bd7f98

diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 047a153b8..7703361e3 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -113,11 +113,11 @@ static int load_font(const char *vc, const char *font, const char *map, const ch
         args[i++] = "-C";
         args[i++] = vc;
         args[i++] = font;
-        if (map && map[0] != '\0') {
+        if (map) {
                 args[i++] = "-m";
                 args[i++] = map;
         }
-        if (unimap && unimap[0] != '\0') {
+        if (unimap) {
                 args[i++] = "-u";
                 args[i++] = unimap;
         }
@@ -186,9 +186,9 @@ int main(int argc, char **argv) {
         }
 
         /* Hmm, nothing set on the kernel cmd line? Then let's
-         * try /etc/vconsole */
+         * try /etc/vconsole.conf */
         if (r <= 0 &&
-            (r = parse_env_file("/etc/vconsole", NEWLINE,
+            (r = parse_env_file("/etc/vconsole.conf", NEWLINE,
                                 "KEYMAP", &vc_keymap,
                                 "FONT", &vc_font,
                                 "FONT_MAP", &vc_font_map,
@@ -196,7 +196,7 @@ int main(int argc, char **argv) {
                                 NULL)) < 0) {
 
                 if (r != -ENOENT)
-                        log_warning("Failed to read /etc/vconsole: %s", strerror(-r));
+                        log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
         }
 
         if (r <= 0) {