fix: Fix getty not started after VT switching #38
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @apr3vau. Thanks for your PR. I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey there - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `src/daemon/TreelandConnector.cpp:55` </location>
<code_context>
- int activeVtFd = open(defaultVtPath, O_RDWR | O_NOCTTY);
- int activeVt = VirtualTerminal::getVtActive(activeVtFd);
+ int activeVt = -1;
+ QFile tty("/sys/class/tty/tty0/active");
+ if (!tty.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ qWarning("Failed to open active tty file");
+ } else {
+ auto active = tty.readAll();
+ tty.close();
+ sscanf(qPrintable(active), "tty%d", &activeVt);
</code_context>
<issue_to_address>
Consider handling potential parsing errors from the active tty file.
Check the return value of sscanf to ensure activeVt is set correctly, and handle cases where parsing fails to prevent invalid VT numbers from being used.
</issue_to_address>
<suggested_fix>
<<<<<<< SEARCH
auto active = tty.readAll();
tty.close();
sscanf(qPrintable(active), "tty%d", &activeVt);
=======
auto active = tty.readAll();
tty.close();
int parsed = sscanf(qPrintable(active), "tty%d", &activeVt);
if (parsed != 1) {
qWarning("Failed to parse active VT from tty file: '%s'", qPrintable(active));
activeVt = -1;
}
>>>>>>> REPLACE
</suggested_fix>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Reviewer's guide (collapsed on small PRs)Reviewer's GuideReplace direct opening and parsing of the default VT device with reading the active VT from sysfs using QFile to avoid locking the terminal, and restructure the default VT device open/close to occur only when handling VT switches. Sequence diagram for VT detection and getty spawning after VT switchsequenceDiagram
participant TreelandConnector
participant QFile
participant Sysfs
participant DisplayManager
participant VirtualTerminal
participant Getty
TreelandConnector->>QFile: Open /sys/class/tty/tty0/active
alt Success
QFile->>Sysfs: Read active VT
QFile-->>TreelandConnector: Return active VT number
else Failure
QFile-->>TreelandConnector: Return error
end
TreelandConnector->>DisplayManager: findUserByVt(activeVt)
alt No user found
TreelandConnector->>Getty: Getty auto-spawn enabled
else User found
TreelandConnector->>VirtualTerminal: handleVtSwitches(activeVtFd)
TreelandConnector->>Getty: Getty not auto-spawned
end
Class diagram for updated VT detection logic in TreelandConnectorclassDiagram
class TreelandConnector {
+onReleaseDisplay()
}
class QFile {
+open()
+readAll()
+close()
}
class VirtualTerminal {
+handleVtSwitches(int fd)
}
TreelandConnector --> QFile : uses
TreelandConnector --> VirtualTerminal : uses
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Hey there - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `src/daemon/TreelandConnector.cpp:53` </location>
<code_context>
ioctl(fd, VT_RELDISP, 1);
close(fd);
- int activeVtFd = open(defaultVtPath, O_RDWR | O_NOCTTY);
- int activeVt = VirtualTerminal::getVtActive(activeVtFd);
+ int activeVt = -1;
</code_context>
<issue_to_address>
Check for open() failure before using activeVtFd.
If open() returns -1, using activeVtFd may cause issues in handleVtSwitches and close. Please add error handling for open().
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
open defaultVtPath occupys current VT file, which will cause error to systemd-getty-generator during its VT check, makes getty auto-spawn impossible. In this commit we read current VT by /sys/class/tty/tty0/active, which avoids occupying current VT.
zccrs
approved these changes
Aug 25, 2025
zccrs
approved these changes
Aug 25, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: apr3vau, zccrs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
open defaultVtPath occupys current VT file, which will cause error to systemd-getty-generator during its VT check, makes getty auto-spawn impossible. In this commit we read current VT by
/sys/class/tty/tty0/active, which avoids occupying current VT.
Summary by Sourcery
Improve VT switching logic by reading the active virtual terminal from sysfs to avoid blocking getty auto-spawn and streamline file descriptor management
Bug Fixes:
Enhancements: