From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 4 May 2020 17:45:19 +0000 (+0200)
Subject: shared/install: print name of offending file in error
X-Git-Tag: v246-rc1~439^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bce84e10f8e38982306b07596584287c1d27d79d;p=thirdparty%2Fsystemd.git

shared/install: print name of offending file in error

"Unit type slice cannot be templated."
↓
"/etc/systemd/system.control/user@.slice: unit type slice cannot be templated."
---

diff --git a/src/shared/install.c b/src/shared/install.c
index a692aed96e9..1d9d5bf6e90 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1226,7 +1226,7 @@ static int unit_file_load(
                         return -EINVAL;
                 if (unit_name_is_valid(info->name, UNIT_NAME_TEMPLATE|UNIT_NAME_INSTANCE) && !unit_type_may_template(type))
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                               "Unit type %s cannot be templated.", unit_type_to_string(type));
+                                               "%s: unit type %s cannot be templated, ignoring.", path, unit_type_to_string(type));
 
                 if (!(flags & SEARCH_LOAD)) {
                         r = lstat(path, &st);