diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-11-22 22:10:32 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-11-22 22:52:48 +0100 |
| commit | 2994ca354bafa4c79d13ce168348c035e6e0428a (patch) | |
| tree | 069c6bc0a145e2772fe369ab32ac44ac04a29b9d /src/basic | |
| parent | namespace-util: handle -ENOSPC by userns_acquire() gracefully in is_idmapping... (diff) | |
| download | systemd-2994ca354bafa4c79d13ce168348c035e6e0428a.tar.xz systemd-2994ca354bafa4c79d13ce168348c035e6e0428a.zip | |
namespace-util: update log messages
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/namespace-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c index 1d566f59e8..5e8908216c 100644 --- a/src/basic/namespace-util.c +++ b/src/basic/namespace-util.c @@ -536,19 +536,19 @@ int is_idmapping_supported(const char *path) { return false; } if (userns_fd < 0) - return log_debug_errno(userns_fd, "ID-mapping supported namespace acquire failed for '%s' : %m", path); + return log_debug_errno(userns_fd, "Failed to acquire new user namespace for checking if '%s' supports ID-mapping: %m", path); dir_fd = RET_NERRNO(open(path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW)); if (ERRNO_IS_NEG_NOT_SUPPORTED(dir_fd)) return false; if (dir_fd < 0) - return log_debug_errno(dir_fd, "ID-mapping supported open failed for '%s' : %m", path); + return log_debug_errno(dir_fd, "Failed to open '%s', cannot determine if ID-mapping is supported: %m", path); mount_fd = RET_NERRNO(open_tree(dir_fd, "", AT_EMPTY_PATH | OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC)); if (ERRNO_IS_NEG_NOT_SUPPORTED(mount_fd) || ERRNO_IS_NEG_PRIVILEGE(mount_fd) || mount_fd == -EINVAL) return false; if (mount_fd < 0) - return log_debug_errno(mount_fd, "ID-mapping supported open_tree failed for '%s' : %m", path); + return log_debug_errno(mount_fd, "Failed to open mount tree '%s', cannot determine if ID-mapping is supported: %m", path); r = RET_NERRNO(mount_setattr(mount_fd, "", AT_EMPTY_PATH, &(struct mount_attr) { @@ -558,7 +558,7 @@ int is_idmapping_supported(const char *path) { if (ERRNO_IS_NEG_NOT_SUPPORTED(r) || ERRNO_IS_NEG_PRIVILEGE(r) || r == -EINVAL) return false; if (r < 0) - return log_debug_errno(r, "ID-mapping supported setattr failed for '%s' : %m", path); + return log_debug_errno(r, "Failed to set mount attribute to '%s', cannot determine if ID-mapping is supported: %m", path); return true; } |