Imported Upstream version 222

[systemd.git] / src / libsystemd-terminal / modeset.c

diff --git a/src/libsystemd-terminal/modeset.c b/src/libsystemd-terminal/modeset.c
index 6e13432d688fb7709a86d48590f6e512ce0157b6..790a244772f11246c00ff0f4c2e992d8529d4973 100644 (file)
--- a/src/libsystemd-terminal/modeset.c
+++ b/src/libsystemd-terminal/modeset.c
@@ -30,26 +30,23 @@
 #include <errno.h>
 #include <getopt.h>
 #include <linux/kd.h>
-#include <linux/vt.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include <systemd/sd-login.h>
 #include <termios.h>
 #include <unistd.h>
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "sd-login.h"
 #include "build.h"
-#include "bus-util.h"
-#include "event-util.h"
-#include "grdev.h"
-#include "grdev-internal.h"
 #include "macro.h"
-#include "sysview.h"
+#include "random-util.h"
+#include "signal-util.h"
 #include "util.h"
+#include "grdev.h"
+#include "sysview.h"
 
 typedef struct Modeset Modeset;
 
@@ -173,7 +170,7 @@ static int modeset_new(Modeset **out) {
         if (r < 0)
                 return r;
 
-        r = sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1);
+        r = sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1);
         if (r < 0)
                 return r;