From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 6 Jan 2012 00:28:30 +0000 (+0100)
Subject: util: fix switching to console unicode mode
X-Git-Tag: v38~37
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df465b3f4419b6ba2e12bf9a5f7d7bde5a0c3531;p=systemd

util: fix switching to console unicode mode

The KDSKBMODE ioctl wants a value directly, not its address.
---

diff --git a/src/util.c b/src/util.c
index 2b735e84..1cff5470 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2453,7 +2453,6 @@ int ask(char *ret, const char *replies, const char *text, ...) {
 int reset_terminal_fd(int fd) {
         struct termios termios;
         int r = 0;
-        long arg;
 
         /* Set terminal to some sane defaults */
 
@@ -2467,8 +2466,7 @@ int reset_terminal_fd(int fd) {
         ioctl(fd, TIOCNXCL);
 
         /* Enable console unicode mode */
-        arg = K_UNICODE;
-        ioctl(fd, KDSKBMODE, &arg);
+        ioctl(fd, KDSKBMODE, K_UNICODE);
 
         if (tcgetattr(fd, &termios) < 0) {
                 r = -errno;