Skip to content

Commit

Permalink
Revert "Don't leak VT FDs in jumpToVt (#1079)" (#1082)
Browse files Browse the repository at this point in the history
This reverts commit b9dd8d9.

openQA had a (single) failure which was caused by a race condition:

sddm[1281]: Jumping to VT 2
sddm[1281]: VT mode didn't need to be fixed
sddm-greeter[2552]: Message received from daemon: LoginSucceeded
susetest systemd[1]: Started Getty on tty2.
[...]
sddm-helper[2558]: Starting: "/usr/share/sddm/scripts/wayland-session dbus-run-session /usr/bin/startplasmacompositor"
sddm-helper[2568]: Failed to take control of the tty: Operation not permitted

As can be seen, sddm jumps to the selected VT, which triggers getty to start.
Then sddm-helper starts the user session, which fails to take control of the
tty as it's already opened by another process.
  • Loading branch information
Vogtinator authored and plfiorini committed Oct 9, 2018
1 parent b9dd8d9 commit 3e45d8b
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/daemon/VirtualTerminal.cpp
Expand Up @@ -187,8 +187,6 @@ namespace SDDM {
qWarning("Couldn't finalize jump to VT %d: %s", vt, strerror(errno));

close(activeVtFd);
if (fd != activeVtFd)
close(fd);
}
}
}

0 comments on commit 3e45d8b

Please sign in to comment.