X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fvconsole%2Fvconsole-setup.c;h=fe8573f9297aa8bffb6421f144786dcc40a6f86a;hp=d8cdb7c609bf810fd2974511b0d15525b7073893;hb=3ac97fd29630f8f34a36f9b70277e53b676cc43a;hpb=dd04aac97f9e4739152e77d9f52bb0d0da1375d6 diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index d8cdb7c60..fe8573f92 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -23,22 +23,18 @@ #include #include #include -#include #include -#include #include -#include #include #include -#include #include #include #include #include "util.h" #include "log.h" -#include "macro.h" #include "virt.h" +#include "fileio.h" static bool is_vconsole(int fd) { unsigned char data[1]; @@ -53,48 +49,61 @@ static int disable_utf8(int fd) { if (ioctl(fd, KDSKBMODE, K_XLATE) < 0) r = -errno; - if (loop_write(fd, "\033%@", 3, false) < 0) - r = -errno; + k = loop_write(fd, "\033%@", 3, false); + if (k < 0) + r = k; - k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "0"); + k = write_string_file("/sys/module/vt/parameters/default_utf8", "0"); if (k < 0) r = k; if (r < 0) - log_warning("Failed to disable UTF-8: %s", strerror(-r)); + log_warning_errno(r, "Failed to disable UTF-8: %m"); return r; } static int enable_utf8(int fd) { int r = 0, k; + long current = 0; + + if (ioctl(fd, KDGKBMODE, ¤t) < 0 || current == K_XLATE) { + /* + * Change the current keyboard to unicode, unless it + * is currently in raw or off mode anyway. We + * shouldn't interfere with X11's processing of the + * key events. + * + * http://lists.freedesktop.org/archives/systemd-devel/2013-February/008573.html + * + */ + + if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0) + r = -errno; + } - if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0) - r = -errno; - - if (loop_write(fd, "\033%G", 3, false) < 0) - r = -errno; + k = loop_write(fd, "\033%G", 3, false); + if (k < 0) + r = k; - k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1"); + k = write_string_file("/sys/module/vt/parameters/default_utf8", "1"); if (k < 0) r = k; if (r < 0) - log_warning("Failed to enable UTF-8: %s", strerror(-r)); + log_warning_errno(r, "Failed to enable UTF-8: %m"); return r; } -static int keymap_load(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) { +static bool keyboard_load_and_wait(const char *vc, const char *map, const char *map_toggle, bool utf8) { const char *args[8]; int i = 0; pid_t pid; - if (isempty(map)) { - /* An empty map means kernel map */ - *_pid = 0; - return 0; - } + /* An empty map means kernel map */ + if (isempty(map)) + return true; args[i++] = KBD_LOADKEYS; args[i++] = "-q"; @@ -109,27 +118,24 @@ static int keymap_load(const char *vc, const char *map, const char *map_toggle, pid = fork(); if (pid < 0) { - log_error("Failed to fork: %m"); - return -errno; + log_error_errno(errno, "Failed to fork: %m"); + return false; } else if (pid == 0) { execv(args[0], (char **) args); _exit(EXIT_FAILURE); } - *_pid = pid; - return 0; + return wait_for_terminate_and_warn(KBD_LOADKEYS, pid, true) == 0; } -static int font_load(const char *vc, const char *font, const char *map, const char *unimap, pid_t *_pid) { +static bool font_load_and_wait(const char *vc, const char *font, const char *map, const char *unimap) { const char *args[9]; int i = 0; pid_t pid; - if (isempty(font)) { - /* An empty font means kernel font */ - *_pid = 0; - return 0; - } + /* An empty font means kernel font */ + if (isempty(font)) + return true; args[i++] = KBD_SETFONT; args[i++] = "-C"; @@ -147,72 +153,88 @@ static int font_load(const char *vc, const char *font, const char *map, const ch pid = fork(); if (pid < 0) { - log_error("Failed to fork: %m"); - return -errno; + log_error_errno(errno, "Failed to fork: %m"); + return false; } else if (pid == 0) { execv(args[0], (char **) args); _exit(EXIT_FAILURE); } - *_pid = pid; - return 0; + return wait_for_terminate_and_warn(KBD_SETFONT, pid, true) == 0; } -static void font_copy_to_all_vts(int fd, int from_vt) { - struct vt_stat vts; - unsigned short bits; - int i; - int r; - - /* get 16 bit mask of used VT numbers */ - zero(vts); - r = ioctl(fd, VT_GETSTATE, &vts); +/* + * A newly allocated VT uses the font from the active VT. Here + * we update all possibly already allocated VTs with the configured + * font. It also allows to restart systemd-vconsole-setup.service, + * to apply a new font to all VTs. + */ +static void font_copy_to_all_vcs(int fd) { + struct vt_stat vcs = {}; + unsigned char map8[E_TABSZ]; + unsigned short map16[E_TABSZ]; + struct unimapdesc unimapd; + struct unipair unipairs[USHRT_MAX]; + int i, r; + + /* get active, and 16 bit mask of used VT numbers */ + r = ioctl(fd, VT_GETSTATE, &vcs); if (r < 0) return; - bits = vts.v_state; - for (i = 1; i <= 16; i++) { - char vtname[16]; - int vtfd; - struct console_font_op cfo; - bool used; - - /* skip unused VTs */ - used = bits & 1; - bits >>= 1; - if (!used) + for (i = 1; i <= 15; i++) { + char vcname[16]; + _cleanup_close_ int vcfd = -1; + struct console_font_op cfo = {}; + + if (i == vcs.v_active) continue; - if (i == from_vt) + /* skip non-allocated ttys */ + snprintf(vcname, sizeof(vcname), "/dev/vcs%i", i); + if (access(vcname, F_OK) < 0) continue; - snprintf(vtname , sizeof(vtname), "/dev/tty%i", i); - vtfd = open_terminal(vtname, O_RDWR|O_CLOEXEC); - if (vtfd < 0) + snprintf(vcname, sizeof(vcname), "/dev/tty%i", i); + vcfd = open_terminal(vcname, O_RDWR|O_CLOEXEC); + if (vcfd < 0) continue; - /* copy font from from_vt to this VT */ - zero(cfo); + /* copy font from active VT, where the font was uploaded to */ cfo.op = KD_FONT_OP_COPY; - /* the index numbers seem to start at 0 for tty1 */ - cfo.height = from_vt - 1; - ioctl(vtfd, KDFONTOP, &cfo); - - close_nointr_nofail(vtfd); + cfo.height = vcs.v_active-1; /* tty1 == index 0 */ + (void) ioctl(vcfd, KDFONTOP, &cfo); + + /* copy map of 8bit chars */ + if (ioctl(fd, GIO_SCRNMAP, map8) >= 0) + (void) ioctl(vcfd, PIO_SCRNMAP, map8); + + /* copy map of 8bit chars -> 16bit Unicode values */ + if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0) + (void) ioctl(vcfd, PIO_UNISCRNMAP, map16); + + /* copy unicode translation table */ + /* unimapd is a ushort count and a pointer to an + array of struct unipair { ushort, ushort } */ + unimapd.entries = unipairs; + unimapd.entry_ct = USHRT_MAX; + if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) { + struct unimapinit adv = { 0, 0, 0 }; + + (void) ioctl(vcfd, PIO_UNIMAPCLR, &adv); + (void) ioctl(vcfd, PIO_UNIMAP, &unimapd); + } } } 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; - int fd = -1; + _cleanup_free_ char + *vc_keymap = NULL, *vc_keymap_toggle = NULL, + *vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL; + _cleanup_close_ int fd = -1; bool utf8; - pid_t font_pid = 0, keymap_pid = 0; - int font_copy_from_vt = 0; + bool font_copy = false, font_ok, keyboard_ok; int r = EXIT_FAILURE; log_set_target(LOG_TARGET_AUTO); @@ -224,25 +246,35 @@ int main(int argc, char **argv) { if (argv[1]) vc = argv[1]; else { - vc = "/dev/tty1"; - font_copy_from_vt = 1; + vc = "/dev/tty0"; + font_copy = true; } fd = open_terminal(vc, O_RDWR|O_CLOEXEC); if (fd < 0) { - log_error("Failed to open %s: %m", vc); - goto finish; + log_error_errno(errno, "Failed to open %s: %m", vc); + return EXIT_FAILURE; } if (!is_vconsole(fd)) { log_error("Device %s is not a virtual console.", vc); - goto finish; + return EXIT_FAILURE; } utf8 = is_locale_utf8(); - r = 0; + 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); + + if (r < 0 && r != -ENOENT) + log_warning_errno(r, "Failed to read /etc/vconsole.conf: %m"); + /* Let the kernel command line override /etc/vconsole.conf */ if (detect_container(NULL) <= 0) { r = parse_env_file("/proc/cmdline", WHITESPACE, "vconsole.keymap", &vc_keymap, @@ -253,22 +285,7 @@ int main(int argc, char **argv) { NULL); if (r < 0 && 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.conf */ - if (r <= 0) { - 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); - - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r)); + log_warning_errno(r, "Failed to read /proc/cmdline: %m"); } if (utf8) @@ -276,28 +293,12 @@ int main(int argc, char **argv) { else disable_utf8(fd); - r = EXIT_FAILURE; - if (keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 && - font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) - r = EXIT_SUCCESS; - -finish: - if (keymap_pid > 0) - wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid); - - if (font_pid > 0) { - wait_for_terminate_and_warn(KBD_SETFONT, font_pid); - if (font_copy_from_vt > 0) - font_copy_to_all_vts(fd, font_copy_from_vt); - } - - free(vc_keymap); - free(vc_font); - free(vc_font_map); - free(vc_font_unimap); + font_ok = font_load_and_wait(vc, vc_font, vc_font_map, vc_font_unimap); + keyboard_ok = keyboard_load_and_wait(vc, vc_keymap, vc_keymap_toggle, utf8); - if (fd >= 0) - close_nointr_nofail(fd); + /* Only copy the font when we executed setfont successfully */ + if (font_copy && font_ok) + font_copy_to_all_vcs(fd); - return r; + return font_ok && keyboard_ok ? EXIT_SUCCESS : EXIT_FAILURE; }