X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvconsole-setup.c;h=c5f3628c9ba887712a0d084bf21ce888db4e7ca6;hb=260a2be45522f03ce8d8aca38e471d7b0882ff05;hp=68ebac9ae498345d2f154907024dab6fa158eff2;hpb=a96257af783f1d2c35a957466856e62ebf82bcad;p=elogind.git diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c index 68ebac9ae..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,6 +172,8 @@ int main(int argc, char **argv) { log_parse_environment(); log_open(); + umask(0022); + if (argv[1]) vc = argv[1]; else @@ -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,