chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vconsole: don't parse Fedora's KEYMAP= kernel parameters anymore
[elogind.git]
/
src
/
vconsole-setup.c
diff --git
a/src/vconsole-setup.c
b/src/vconsole-setup.c
index 1be260bc2f41011b24fe78be83505a000c27426e..c5f3628c9ba887712a0d084bf21ce888db4e7ca6 100644
(file)
--- a/
src/vconsole-setup.c
+++ b/
src/vconsole-setup.c
@@
-39,6
+39,7
@@
#include "util.h"
#include "log.h"
#include "macro.h"
#include "util.h"
#include "log.h"
#include "macro.h"
+#include "virt.h"
static bool is_vconsole(int fd) {
unsigned char data[1];
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();
log_parse_environment();
log_open();
+ umask(0022);
+
if (argv[1])
vc = argv[1];
else
vc = "/dev/tty0";
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;
}
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 (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,
"vconsole.keymap", &vc_keymap,
"vconsole.keymap.toggle", &vc_keymap_toggle,
"vconsole.font", &vc_font,