X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fvconsole-setup.c;h=1be260bc2f41011b24fe78be83505a000c27426e;hp=67fb7b61002dcdcfb2352f9d51f85072ff5c445a;hb=944d4c91e68508d997409008ab7acd8d6e162965;hpb=03aea2aecd6f9d2193af5d6cf866063da8d47ad5

diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 67fb7b610..1be260bc2 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -83,6 +83,12 @@ static int load_keymap(const char *vc, const char *map, const char *map_toggle,
         int i = 0;
         pid_t pid;
 
+        if (isempty(map)) {
+                /* An empty map means kernel map */
+                *_pid = 0;
+                return 0;
+        }
+
         args[i++] = KBD_LOADKEYS;
         args[i++] = "-q";
         args[i++] = "-C";
@@ -111,6 +117,12 @@ static int load_font(const char *vc, const char *font, const char *map, const ch
         int i = 0;
         pid_t pid;
 
+        if (isempty(font)) {
+                /* An empty font means kernel font */
+                *_pid = 0;
+                return 0;
+        }
+
         args[i++] = KBD_SETFONT;
         args[i++] = "-C";
         args[i++] = vc;
@@ -155,7 +167,7 @@ int main(int argc, char **argv) {
         int r = EXIT_FAILURE;
         pid_t font_pid = 0, keymap_pid = 0;
 
-        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+        log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
@@ -176,9 +188,19 @@ int main(int argc, char **argv) {
 
         utf8 = is_locale_utf8();
 
+        vc_keymap = strdup("us");
+        vc_font = strdup(DEFAULT_FONT);
+
+        if (!vc_keymap || !vc_font) {
+                log_error("Failed to allocate strings.");
+                goto finish;
+        }
+
+        r = 0;
+
         if (detect_container(NULL) <= 0)
                 if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
-#ifdef TARGET_FEDORA
+#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
                                         "SYSFONT", &vc_font,
                                         "KEYTABLE", &vc_keymap,
 #endif
@@ -209,7 +231,7 @@ int main(int argc, char **argv) {
         }
 
         if (r <= 0) {
-#ifdef TARGET_FEDORA
+#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
                 if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                         "SYSFONT", &vc_font,
                                         "SYSFONTACM", &vc_font_map,
@@ -410,15 +432,7 @@ int main(int argc, char **argv) {
 #endif
         }
 
-        if (!vc_keymap)
-                vc_keymap = strdup("us");
-        if (!vc_font)
-                vc_font = strdup(DEFAULT_FONT);
-
-        if (!vc_keymap || !vc_font) {
-                log_error("Failed to allocate strings.");
-                goto finish;
-        }
+        r = EXIT_FAILURE;
 
         if (!utf8)
                 disable_utf8(fd);