From bd68e99bd005de29c2cbf6adfb4c6938ee571f61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 2 Jul 2017 12:03:25 -0400 Subject: [PATCH] Be slightly more verbose in error message Including the full path is always useful. Also use PID_FMT in one more place. --- src/basic/cgroup-util.c | 2 +- src/nspawn/nspawn-cgroup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index c828d10149..6344372610 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 d749756437..fd565c09cd 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; } -- 2.25.1