chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap: use different version of DJB's hash algorithm that uses shifting instead...
[elogind.git]
/
src
/
vconsole-setup.c
diff --git
a/src/vconsole-setup.c
b/src/vconsole-setup.c
index 67fb7b61002dcdcfb2352f9d51f85072ff5c445a..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];
@@
-83,6
+84,12
@@
static int load_keymap(const char *vc, const char *map, const char *map_toggle,
int i = 0;
pid_t pid;
int i = 0;
pid_t pid;
+ if (isempty(map)) {
+ /* An empty map means kernel map */
+ *_pid = 0;
+ return 0;
+ }
+
args[i++] = KBD_LOADKEYS;
args[i++] = "-q";
args[i++] = "-C";
args[i++] = KBD_LOADKEYS;
args[i++] = "-q";
args[i++] = "-C";
@@
-111,6
+118,12
@@
static int load_font(const char *vc, const char *font, const char *map, const ch
int i = 0;
pid_t pid;
int i = 0;
pid_t pid;
+ if (isempty(font)) {
+ /* An empty font means kernel font */
+ *_pid = 0;
+ return 0;
+ }
+
args[i++] = KBD_SETFONT;
args[i++] = "-C";
args[i++] = vc;
args[i++] = KBD_SETFONT;
args[i++] = "-C";
args[i++] = vc;
@@
-155,16
+168,18
@@
int main(int argc, char **argv) {
int r = EXIT_FAILURE;
pid_t font_pid = 0, keymap_pid = 0;
int r = EXIT_FAILURE;
pid_t font_pid = 0, keymap_pid = 0;
- log_set_target(LOG_TARGET_
SYSLOG_OR_KMSG
);
+ log_set_target(LOG_TARGET_
AUTO
);
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;
}
@@
-176,12
+191,18
@@
int main(int argc, char **argv) {
utf8 = is_locale_utf8();
utf8 = is_locale_utf8();
+ vc_keymap = strdup("us");
+ vc_font = strdup(DEFAULT_FONT);
+
+ if (!vc_keymap || !vc_font) {
+ log_error("Failed to allocate strings.");
+ goto finish;
+ }
+
+ r = 0;
+
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,
-#ifdef TARGET_FEDORA
- "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,
@@
-209,7
+230,7
@@
int main(int argc, char **argv) {
}
if (r <= 0) {
}
if (r <= 0) {
-#if
def TARGET_FEDORA
+#if
defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font,
"SYSFONTACM", &vc_font_map,
if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font,
"SYSFONTACM", &vc_font_map,
@@
-410,15
+431,7
@@
int main(int argc, char **argv) {
#endif
}
#endif
}
- if (!vc_keymap)
- vc_keymap = strdup("us");
- if (!vc_font)
- vc_font = strdup(DEFAULT_FONT);
-
- if (!vc_keymap || !vc_font) {
- log_error("Failed to allocate strings.");
- goto finish;
- }
+ r = EXIT_FAILURE;
if (!utf8)
disable_utf8(fd);
if (!utf8)
disable_utf8(fd);