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/firstboot | |
| parent | process-util: add a new FORK_MOUNTNS_SLAVE flag for safe_fork() (diff) | |
| download | systemd-1a5a177eafa72adfd40916be05f35b71011014b0.tar.gz systemd-1a5a177eafa72adfd40916be05f35b71011014b0.tar.bz2 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/firstboot')
| -rw-r--r-- | src/firstboot/firstboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 7895e3832..9b091bf87 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -87,13 +87,13 @@ static void print_welcome(void) { return; os_release = prefix_roota(arg_root, "/etc/os-release"); - r = parse_env_file(os_release, NEWLINE, + r = parse_env_file(NULL, os_release, NEWLINE, "PRETTY_NAME", &pretty_name, NULL); if (r == -ENOENT) { os_release = prefix_roota(arg_root, "/usr/lib/os-release"); - r = parse_env_file(os_release, NEWLINE, + r = parse_env_file(NULL, os_release, NEWLINE, "PRETTY_NAME", &pretty_name, NULL); } |