diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-12 14:04:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-14 17:01:54 +0100 |
| commit | aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6 (patch) | |
| tree | ea8b676c0cfc8d35dd9977d16a6fcf214704200d /src/portable | |
| parent | tree-wide: replace all remaining uses of parse_env_file() for parsing /proc/c... (diff) | |
| download | systemd-aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6.tar.xz systemd-aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6.zip | |
fileio: drop "newline" parameter for env file parsers
Now that we don't (mis-)use the env file parser to parse kernel command
lines there's no need anymore to override the used newline character
set. Let's hence drop the argument and just "\n\r" always. This nicely
simplifies our code.
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/portablectl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c index 21e66def50..1b77e4bcb0 100644 --- a/src/portable/portablectl.c +++ b/src/portable/portablectl.c @@ -279,7 +279,7 @@ static int inspect_image(int argc, char *argv[], void *userdata) { if (!f) return log_error_errno(errno, "Failed to open /etc/os-release buffer: %m"); - r = parse_env_file(f, "/etc/os-release", NEWLINE, + r = parse_env_file(f, "/etc/os-release", "PORTABLE_PRETTY_NAME", &pretty_portable, "PRETTY_NAME", &pretty_os, NULL); |