From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 2 Jul 2017 16:03:25 +0000 (-0400)
Subject: Be slightly more verbose in error message
X-Git-Tag: v234~53^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd68e99bd005de29c2cbf6adfb4c6938ee571f61;p=thirdparty%2Fsystemd.git

Be slightly more verbose in error message

Including the full path is always useful.

Also use PID_FMT in one more place.
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index c828d101494..6344372610b 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -840,7 +840,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
         if (r > 0 && streq(controller, SYSTEMD_CGROUP_CONTROLLER)) {
                 r = cg_attach(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, pid);
                 if (r < 0)
-                        log_warning_errno(r, "Failed to attach %d to compat systemd cgroup %s: %m", pid, path);
+                        log_warning_errno(r, "Failed to attach "PID_FMT" to compat systemd cgroup %s: %m", pid, path);
         }
 
         return 0;
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index d749756437c..fd565c09cdf 100644
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -49,7 +49,7 @@ static int chown_cgroup_path(const char *path, uid_t uid_shift) {
                        "cgroup.subtree_control")
                 if (fchownat(fd, fn, uid_shift, uid_shift, 0) < 0)
                         log_full_errno(errno == ENOENT ? LOG_DEBUG :  LOG_WARNING, errno,
-                                       "Failed to chown() cgroup file %s, ignoring: %m", fn);
+                                       "Failed to chown \"%s/%s\", ignoring: %m", path, fn);
 
         return 0;
 }