diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-04-23 14:50:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-04-23 14:50:07 +0200 |
| commit | 0f7e4b2888840e7e6a702aa8ce5d3e3b2bc077ef (patch) | |
| tree | 4b5ca01ba97d64ae62ea1a5757396bc29f5341dd | |
| parent | 2230e8f29ddb018697b9c3d13c1f522c62976e70 (diff) | |
| download | systemd-0f7e4b2888840e7e6a702aa8ce5d3e3b2bc077ef.tar.gz | |
sysusers,tmpfiles: always mention error when failing to replace specifiers
| -rw-r--r-- | src/sysusers/sysusers.c | 10 | ||||
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index a06eafae22..f0359e3019 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -1443,7 +1443,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (name) { r = specifier_printf(name, specifier_table, NULL, &resolved_name); if (r < 0) - return log_error_errno(r, "[%s:%u] Failed to replace specifiers: %s", fname, line, name); + return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m", fname, line, name); if (!valid_user_group_name(resolved_name, 0)) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), @@ -1458,7 +1458,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (id) { r = specifier_printf(id, specifier_table, NULL, &resolved_id); if (r < 0) - return log_error_errno(r, "[%s:%u] Failed to replace specifiers: %s", + return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m", fname, line, name); } @@ -1469,7 +1469,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (description) { r = specifier_printf(description, specifier_table, NULL, &resolved_description); if (r < 0) - return log_error_errno(r, "[%s:%u] Failed to replace specifiers: %s", + return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m", fname, line, description); if (!valid_gecos(resolved_description)) @@ -1485,7 +1485,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (home) { r = specifier_printf(home, specifier_table, NULL, &resolved_home); if (r < 0) - return log_error_errno(r, "[%s:%u] Failed to replace specifiers: %s", + return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m", fname, line, home); if (!valid_home(resolved_home)) @@ -1501,7 +1501,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (shell) { r = specifier_printf(shell, specifier_table, NULL, &resolved_shell); if (r < 0) - return log_error_errno(r, "[%s:%u] Failed to replace specifiers: %s", + return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m", fname, line, shell); if (!valid_shell(resolved_shell)) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 6ab30cdecf..6f0dc2426e 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -2556,7 +2556,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, bool if (r < 0) { if (IN_SET(r, -EINVAL, -EBADSLT)) *invalid_config = true; - return log_error_errno(r, "[%s:%u] Failed to replace specifiers: %s", fname, line, path); + return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m", fname, line, path); } r = patch_var_run(fname, line, &i.path); |