dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

vconsole-setup: remember the correct error value when open_terminal() fails

Browse Source
This commit is contained in:
Franck Bui
2023-12-18 12:47:21 +01:00
parent 58161db61b
commit 0d29fd46d1
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vconsole/vconsole-setup.c
View File

@@ -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;
}