From 9d72a3cf70574bf2aebf874649dd9e8855d535d4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 29 Aug 2022 15:10:16 +0200 Subject: [PATCH 1/2] loop: make 'Failed to configure loopback device' log message clearer We print the very same log message for loopback block devices and for loopback network devices. Let's better be clear what kind it is. --- src/shared/loop-util.c | 2 +- src/shared/loopback-setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c index b9c63e2e4c..ce9a982f02 100644 --- a/src/shared/loop-util.c +++ b/src/shared/loop-util.c @@ -284,7 +284,7 @@ static int loop_configure( if (ioctl(fd, LOOP_SET_STATUS64, &info_copy) >= 0) break; if (errno != EAGAIN || ++n_attempts >= 64) { - r = log_debug_errno(errno, "Failed to configure loopback device: %m"); + r = log_debug_errno(errno, "Failed to configure loopback block device: %m"); goto fail; } diff --git a/src/shared/loopback-setup.c b/src/shared/loopback-setup.c index 8434c887d9..0092289022 100644 --- a/src/shared/loopback-setup.c +++ b/src/shared/loopback-setup.c @@ -211,7 +211,7 @@ int loopback_setup(void) { if (state_up.rcode == -EPERM && check_loopback(rtnl)) return 0; - return log_warning_errno(state_up.rcode, "Failed to configure loopback device: %m"); + return log_warning_errno(state_up.rcode, "Failed to configure loopback network device: %m"); } return 0; From b3d6f706922cbbd94f85b8d5878756d88b657b56 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 29 Aug 2022 15:11:09 +0200 Subject: [PATCH 2/2] loopback: use ERRNO_IS_PRIVILEGE() where appropriate --- src/shared/loopback-setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/loopback-setup.c b/src/shared/loopback-setup.c index 0092289022..dae78cde89 100644 --- a/src/shared/loopback-setup.c +++ b/src/shared/loopback-setup.c @@ -208,7 +208,7 @@ int loopback_setup(void) { /* If we lack the permissions to configure the loopback device, * but we find it to be already configured, let's exit cleanly, * in order to supported unprivileged containers. */ - if (state_up.rcode == -EPERM && check_loopback(rtnl)) + if (ERRNO_IS_PRIVILEGE(state_up.rcode) && check_loopback(rtnl)) return 0; return log_warning_errno(state_up.rcode, "Failed to configure loopback network device: %m");