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

diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 1be260bc2..c5f3628c9 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -39,6 +39,7 @@
 #include "util.h"
 #include "log.h"
 #include "macro.h"
+#include "virt.h"
 
 static bool is_vconsole(int fd) {
         unsigned char data[1];
@@ -171,12 +172,14 @@ int main(int argc, char **argv) {
         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;
         }
@@ -200,10 +203,6 @@ int main(int argc, char **argv) {
 
         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,