chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: increase default timeout for sysv scripts to 3min
[elogind.git]
/
src
/
vconsole-setup.c
diff --git
a/src/vconsole-setup.c
b/src/vconsole-setup.c
index 047a153b87d38b877eceabd8dae83c3063e5a46a..7703361e33ef6029f372a04006d1806fe989a452 100644
(file)
--- a/
src/vconsole-setup.c
+++ b/
src/vconsole-setup.c
@@
-113,11
+113,11
@@
static int load_font(const char *vc, const char *font, const char *map, const ch
args[i++] = "-C";
args[i++] = vc;
args[i++] = font;
args[i++] = "-C";
args[i++] = vc;
args[i++] = font;
- if (map
&& map[0] != '\0'
) {
+ if (map) {
args[i++] = "-m";
args[i++] = map;
}
args[i++] = "-m";
args[i++] = map;
}
- if (unimap
&& unimap[0] != '\0'
) {
+ if (unimap) {
args[i++] = "-u";
args[i++] = unimap;
}
args[i++] = "-u";
args[i++] = unimap;
}
@@
-186,9
+186,9
@@
int main(int argc, char **argv) {
}
/* Hmm, nothing set on the kernel cmd line? Then let's
}
/* Hmm, nothing set on the kernel cmd line? Then let's
- * try /etc/vconsole */
+ * try /etc/vconsole
.conf
*/
if (r <= 0 &&
if (r <= 0 &&
- (r = parse_env_file("/etc/vconsole", NEWLINE,
+ (r = parse_env_file("/etc/vconsole
.conf
", NEWLINE,
"KEYMAP", &vc_keymap,
"FONT", &vc_font,
"FONT_MAP", &vc_font_map,
"KEYMAP", &vc_keymap,
"FONT", &vc_font,
"FONT_MAP", &vc_font_map,
@@
-196,7
+196,7
@@
int main(int argc, char **argv) {
NULL)) < 0) {
if (r != -ENOENT)
NULL)) < 0) {
if (r != -ENOENT)
- log_warning("Failed to read /etc/vconsole: %s", strerror(-r));
+ log_warning("Failed to read /etc/vconsole
.conf
: %s", strerror(-r));
}
if (r <= 0) {
}
if (r <= 0) {