Merge lp://qastaging/~mterry/lightdm/vt into lp://qastaging/lightdm

Proposed by Michael Terry
Status: Merged
Merged at revision: 2407
Proposed branch: lp://qastaging/~mterry/lightdm/vt
Merge into: lp://qastaging/lightdm
Diff against target: 21 lines (+5/-1)
1 file modified
src/vt.c (+5/-1)
To merge this branch: bzr merge lp://qastaging/~mterry/lightdm/vt
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+308894@code.qastaging.launchpad.net

Commit message

Be more correct with VT ioctl usage.

Description of the change

- Pass the VT number to VT_WAITACTIVE.
- Don't call VT_WAITACTIVE if VT_ACTIVATE fails.

c.f.
https://cgit.freedesktop.org/xorg/xserver/tree/hw/kdrive/linux/linux.c#n238
https://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/os-support/linux/lnx_init.c#n66

Haven't tested this yet, just seems more correct. Will report back once tested.

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

As discussed, these look like logical changes. Feel free to push when you're happy it's safe.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches