morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

logind: save position only if we have a seat

Browse Source
This commit is contained in:
Lennart Poettering
2025-05-22 18:04:25 +02:00
committed by Mike Yuan
parent 2be3a06bb2
commit 736b627775
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/login/logind-session.c
View File

@@ -341,11 +341,12 @@ int session_save(Session *s) {
env_file_fputs_assignment(f, "SERVICE=", s->service);
env_file_fputs_assignment(f, "DESKTOP=", s->desktop);
if (s->seat && seat_has_vts(s->seat))
fprintf(f, "VTNR=%u\n", s->vtnr);
if (!s->vtnr)
fprintf(f, "POSITION=%u\n", s->position);
if (s->seat) {
if (!seat_has_vts(s->seat))
fprintf(f, "POSITION=%u\n", s->position);
else if (s->vtnr > 0)
fprintf(f, "VTNR=%u\n", s->vtnr);
}
if (pidref_is_set(&s->leader)) {
fprintf(f, "LEADER="PID_FMT"\n", s->leader.pid);
@@ -495,7 +496,7 @@ int session_load(Session *s) {
}
if (vtnr)
safe_atou(vtnr, &s->vtnr);
(void) safe_atou(vtnr, &s->vtnr);
if (seat && !s->seat) {
Seat *o;
@@ -513,7 +514,7 @@ int session_load(Session *s) {
if (position && s->seat) {
unsigned npos;
safe_atou(position, &npos);
(void) safe_atou(position, &npos);
seat_claim_position(s->seat, s, npos);
}