~robert-ancell/lightdm/private-mir-connection-merge

« back to all changes in this revision

Viewing changes to tests/scripts/switch-to-greeter.conf

  • Committer: Robert Ancell
  • Date: 2013-07-23 02:24:45 UTC
  • mfrom: (1723 trunk)
  • mto: This revision was merged to the branch mainline in revision 1741.
  • Revision ID: robert.ancell@canonical.com-20130723022445-gpaq8vtkp4hods7r
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
 
11
11
# X server starts
12
12
#?XSERVER-0 START VT=7
 
13
 
 
14
# Daemon connects when X server is ready
 
15
#?*XSERVER-0 INDICATE-READY
13
16
#?XSERVER-0 INDICATE-READY
14
 
 
15
 
# LightDM connects to X server
16
17
#?XSERVER-0 ACCEPT-CONNECT
17
18
 
18
19
# Session starts
26
27
 
27
28
# New X server starts
28
29
#?XSERVER-1 START VT=8
 
30
 
 
31
# Daemon connects when X server is ready
 
32
#?*XSERVER-1 INDICATE-READY
29
33
#?XSERVER-1 INDICATE-READY
30
 
 
31
 
# LightDM connects to X server
32
34
#?XSERVER-1 ACCEPT-CONNECT
33
35
 
34
36
# Greeter starts