diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-23 21:31:14 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-05-24 17:01:57 +0200 |
| commit | 1a5a177eafa72adfd40916be05f35b71011014b0 (patch) | |
| tree | df4d3504ef6ea99aaf75f9cce66a3dc3127fc296 /src/vconsole | |
| parent | process-util: add a new FORK_MOUNTNS_SLAVE flag for safe_fork() (diff) | |
| download | systemd-1a5a177eafa72adfd40916be05f35b71011014b0.tar.xz systemd-1a5a177eafa72adfd40916be05f35b71011014b0.zip | |
fileio: accept FILE* in addition to path in parse_env_file()
Most our other parsing functions do this, let's do this here too,
internally we accept that anyway. Also, the closely related
load_env_file() and load_env_file_pairs() also do this, so let's be
systematic.
Diffstat (limited to 'src/vconsole')
| -rw-r--r-- | src/vconsole/vconsole-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 9cda56e916..6bf773a1ed 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -420,7 +420,7 @@ int main(int argc, char **argv) { utf8 = is_locale_utf8(); - r = parse_env_file("/etc/vconsole.conf", NEWLINE, + r = parse_env_file(NULL, "/etc/vconsole.conf", NEWLINE, "KEYMAP", &vc_keymap, "KEYMAP_TOGGLE", &vc_keymap_toggle, "FONT", &vc_font, @@ -432,7 +432,7 @@ int main(int argc, char **argv) { /* Let the kernel command line override /etc/vconsole.conf */ if (detect_container() <= 0) { - r = parse_env_file("/proc/cmdline", WHITESPACE, + r = parse_env_file(NULL, "/proc/cmdline", WHITESPACE, "vconsole.keymap", &vc_keymap, "vconsole.keymap_toggle", &vc_keymap_toggle, "vconsole.font", &vc_font, |