diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-15 12:47:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 12:47:17 +0100 |
| commit | cd5a29ce983d0ccfa24b349288146d43b387c885 (patch) | |
| tree | 749a8230da2674fb2f7778b70c8e0cadf791f969 /src/portable | |
| parent | 042cad5737917e6964ddddba72b8fcc0cb890877 (diff) | |
| parent | 483d713e0a39ecfe028ec49b9d9b0e67658ea79f (diff) | |
| download | systemd-cd5a29ce983d0ccfa24b349288146d43b387c885.tar.gz | |
Merge pull request #10742 from poettering/c-utf8
default to C.UTF-8 locale, and many improvements to env var file parsing/kernel cmdline parsing
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/portablectl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c index ff402151e9..341fd14dc2 100644 --- a/src/portable/portablectl.c +++ b/src/portable/portablectl.c @@ -279,10 +279,9 @@ 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); + "PRETTY_NAME", &pretty_os); if (r < 0) return log_error_errno(r, "Failed to parse /etc/os-release: %m"); |