X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fvconsole-setup.c;h=4347a2078f64b6aa55302185b16131bcf9bf2fca;hp=047a153b87d38b877eceabd8dae83c3063e5a46a;hb=afbb67e485aa76d1b5f19b15f661eb42ae5ca0cd;hpb=915d22e4f09e8f6d7fb2e7a7456f8b5908bd7f98 diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c index 047a153b8..4347a2078 100644 --- a/src/vconsole-setup.c +++ b/src/vconsole-setup.c @@ -78,11 +78,17 @@ static int disable_utf8(int fd) { return r; } -static int load_keymap(const char *vc, const char *map, bool utf8, pid_t *_pid) { - const char *args[7]; +static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) { + const char *args[8]; 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"; @@ -90,6 +96,8 @@ static int load_keymap(const char *vc, const char *map, bool utf8, pid_t *_pid) if (utf8) args[i++] = "-u"; args[i++] = map; + if (map_toggle) + args[i++] = map_toggle; args[i++] = NULL; if ((pid = fork()) < 0) { @@ -109,15 +117,21 @@ 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; 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; } @@ -138,27 +152,33 @@ static int load_font(const char *vc, const char *font, const char *map, const ch int main(int argc, char **argv) { const char *vc; char *vc_keymap = NULL; + char *vc_keymap_toggle = NULL; char *vc_font = NULL; char *vc_font_map = NULL; char *vc_font_unimap = NULL; #ifdef TARGET_GENTOO char *vc_unicode = NULL; +#endif +#ifdef TARGET_MANDRIVA + char *vc_keytable = NULL; #endif int fd = -1; bool utf8; 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(); + umask(0022); + if (argv[1]) vc = argv[1]; else vc = "/dev/tty0"; - if ((fd = open(vc, O_RDWR|O_CLOEXEC)) < 0) { + if ((fd = open_terminal(vc, O_RDWR|O_CLOEXEC)) < 0) { log_error("Failed to open %s: %m", vc); goto finish; } @@ -170,37 +190,50 @@ int main(int argc, char **argv) { utf8 = is_locale_utf8(); - if ((r = parse_env_file("/proc/cmdline", WHITESPACE, -#ifdef TARGET_FEDORA - "SYSFONT", &vc_font, - "KEYTABLE", &vc_keymap, -#endif - "vconsole.keymap", &vc_keymap, - "vconsole.font", &vc_font, - "vconsole.font.map", &vc_font_map, - "vconsole.font.unimap", &vc_font_unimap, - NULL)) < 0) { + vc_keymap = strdup("us"); + vc_font = strdup(DEFAULT_FONT); - if (r != -ENOENT) - log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); + 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, +#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) + "SYSFONT", &vc_font, + "KEYTABLE", &vc_keymap, +#endif + "vconsole.keymap", &vc_keymap, + "vconsole.keymap.toggle", &vc_keymap_toggle, + "vconsole.font", &vc_font, + "vconsole.font.map", &vc_font_map, + "vconsole.font.unimap", &vc_font_unimap, + NULL)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); + } + /* 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, + "KEYMAP_TOGGLE", &vc_keymap_toggle, "FONT", &vc_font, "FONT_MAP", &vc_font_map, "FONT_UNIMAP", &vc_font_unimap, 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) { -#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, @@ -262,6 +295,37 @@ int main(int argc, char **argv) { log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); } +#elif defined(TARGET_FRUGALWARE) + if ((r = parse_env_file("/etc/sysconfig/keymap", NEWLINE, + "keymap", &vc_keymap, + NULL)) < 0) { + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/keymap: %s", strerror(-r)); + } + if ((r = parse_env_file("/etc/sysconfig/font", NEWLINE, + "font", &vc_font, + NULL)) < 0) { + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/font: %s", strerror(-r)); + } + +#elif defined(TARGET_ALTLINUX) + if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, + "KEYTABLE", &vc_keymap, + NULL)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r)); + } + + if ((r = parse_env_file("/etc/sysconfig/consolefont", NEWLINE, + "SYSFONT", &vc_font, + NULL)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r)); + } + #elif defined(TARGET_GENTOO) if ((r = parse_env_file("/etc/rc.conf", NEWLINE, "unicode", &vc_unicode, @@ -309,23 +373,73 @@ int main(int argc, char **argv) { if (r != -ENOENT) log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r)); } -#endif - } - if (!vc_keymap) - vc_keymap = strdup("us"); - if (!vc_font) - vc_font = strdup(DEFAULT_FONT); +#elif defined(TARGET_MANDRIVA) - if (!vc_keymap || !vc_font) { - log_error("Failed to allocate strings."); - goto finish; + if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, + "SYSFONT", &vc_font, + "SYSFONTACM", &vc_font_map, + "UNIMAP", &vc_font_unimap, + NULL)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); + } + + if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, + "KEYTABLE", &vc_keytable, + "KEYMAP", &vc_keymap, + "UNIKEYTABLE", &vc_keymap, + "GRP_TOGGLE", &vc_keymap_toggle, + NULL)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); + } + + if (vc_keytable) { + if (vc_keymap) + free(vc_keymap); + if (utf8) { + if (endswith(vc_keytable, ".uni") || strstr(vc_keytable, ".uni.")) + vc_keymap = strdup(vc_keytable); + else { + char *s; + if ((s = strstr(vc_keytable, ".map"))) + vc_keytable[s-vc_keytable+1] = '\0'; + vc_keymap = strappend(vc_keytable, ".uni"); + } + } else + vc_keymap = strdup(vc_keytable); + + free(vc_keytable); + + if (!vc_keymap) { + log_error("Out of memory."); + goto finish; + } + } + + if (access("/etc/sysconfig/console/default.kmap", F_OK) >= 0) { + char *t; + + if (!(t = strdup("/etc/sysconfig/console/default.kmap"))) { + log_error("Out of memory."); + goto finish; + } + + free(vc_keymap); + vc_keymap = t; + } +#endif } + r = EXIT_FAILURE; + if (!utf8) disable_utf8(fd); - if (load_keymap(vc, vc_keymap, utf8, &keymap_pid) >= 0 && + if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 && load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) r = EXIT_SUCCESS;