picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

firstboot: do not write vconsole.conf when arg_keymap is empty

This commit is contained in:
Yu Watanabe 2017-11-25 19:11:57 +09:00
parent 4540ae7400
commit a7353b4d14
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/firstboot/firstboot.c
View File

@ -346,13 +346,15 @@ static int process_keymap(void) {
if (r < 0)
return r;
if (!isempty(arg_keymap))
keymap = STRV_MAKE(strjoina("KEYMAP=", arg_keymap));
if (!keymap)
if (isempty(arg_keymap))
return 0;
mkdir_parents(etc_vconsoleconf, 0755);
keymap = STRV_MAKE(strjoina("KEYMAP=", arg_keymap));
r = mkdir_parents(etc_vconsoleconf, 0755);
if (r < 0)
return log_error_errno(r, "Failed to create the parent directory of %s: %m", etc_vconsoleconf);
r = write_env_file(etc_vconsoleconf, keymap);
if (r < 0)
return log_error_errno(r, "Failed to write %s: %m", etc_vconsoleconf);