chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: increase rate limit burst rate
[elogind.git]
/
src
/
vconsole-setup.c
diff --git
a/src/vconsole-setup.c
b/src/vconsole-setup.c
index 68ebac9ae498345d2f154907024dab6fa158eff2..91967891f15115909fe9a1d34395b4e9506d8a23 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];
@@
-159,7
+160,7
@@
int main(int argc, char **argv) {
#ifdef TARGET_GENTOO
char *vc_unicode = NULL;
#endif
#ifdef TARGET_GENTOO
char *vc_unicode = NULL;
#endif
-#if
def TARGET_MANDRIVA
+#if
defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
char *vc_keytable = NULL;
#endif
int fd = -1;
char *vc_keytable = NULL;
#endif
int fd = -1;
@@
-171,6
+172,8
@@
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
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 (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,
@@
-372,7
+371,7
@@
int main(int argc, char **argv) {
log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
}
log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
}
-#elif defined(TARGET_MANDRIVA)
+#elif defined(TARGET_MANDRIVA)
|| defined (TARGET_MAGEIA)
if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font,
if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font,