From 0d29fd46d12585ef16c0e611fba7f50ebfa32cbb Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 18 Dec 2023 12:47:21 +0100 Subject: [PATCH] vconsole-setup: remember the correct error value when open_terminal() fails --- src/vconsole/vconsole-setup.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 4c28f43808b..83e43b16ff9 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -537,22 +537,19 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) { fd = open_terminal(path, O_RDWR|O_CLOEXEC|O_NOCTTY); if (fd < 0) { - log_debug_errno(fd, "Failed to open terminal %s, ignoring: %m", path); - RET_GATHER(err, r); + RET_GATHER(err, log_debug_errno(fd, "Failed to open terminal %s, ignoring: %m", path)); continue; } r = verify_vc_kbmode(fd); if (r < 0) { - log_debug_errno(r, "Failed to check VC %s keyboard mode: %m", path); - RET_GATHER(err, r); + RET_GATHER(err, log_debug_errno(r, "Failed to check VC %s keyboard mode: %m", path)); continue; } r = verify_vc_display_mode(fd); if (r < 0) { - log_debug_errno(r, "Failed to check VC %s display mode: %m", path); - RET_GATHER(err, r); + RET_GATHER(err, log_debug_errno(r, "Failed to check VC %s display mode: %m", path)); continue; } -- 2.47.3