From e85c644ede7ee73a7bd72702b68a727fe2740f16 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 18 May 2023 15:14:20 +0200 Subject: [PATCH] nspawn: make the error message less confusing by not printing (null) and dropping the extraneous slash, e.g.: systemd-nspawn[2049]: Failed to resolve (null)//proc: Permission denied --- src/nspawn/nspawn-mount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index ac9dc5116e8..fcf5c710f1d 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -638,7 +638,7 @@ int mount_all(const char *dest, r = chase(mount_table[k].where, dest, CHASE_NONEXISTENT|CHASE_PREFIX_ROOT, &where, NULL); if (r < 0) - return log_error_errno(r, "Failed to resolve %s/%s: %m", dest, mount_table[k].where); + return log_error_errno(r, "Failed to resolve %s%s: %m", strempty(dest), mount_table[k].where); /* Skip this entry if it is not a remount. */ if (mount_table[k].what) { @@ -697,7 +697,7 @@ int mount_all(const char *dest, * for those. */ r = chase(mount_table[k].what, dest, CHASE_PREFIX_ROOT, &prefixed, NULL); if (r < 0) - return log_error_errno(r, "Failed to resolve %s/%s: %m", dest, mount_table[k].what); + return log_error_errno(r, "Failed to resolve %s%s: %m", strempty(dest), mount_table[k].what); } r = mount_verbose_full( -- 2.47.3