diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2015-05-14 16:12:06 +1200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2015-05-14 16:12:06 +1200 |
commit | 575c10bf301f156f8e23f6288d4ad3b4cfed32f3 (patch) | |
tree | 5d9378f4267b6d7bf3b479a59acd1d45981d103e /tests/scripts/unity-switch.conf | |
parent | 015c9937df08acb97063ae52e90e92b130e9d167 (diff) | |
download | lightdm-575c10bf301f156f8e23f6288d4ad3b4cfed32f3.tar.gz |
Use new Xmir binary when running X under Unity System Compositor
Diffstat (limited to 'tests/scripts/unity-switch.conf')
-rw-r--r-- | tests/scripts/unity-switch.conf | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf index d63416ea..51cf79d1 100644 --- a/tests/scripts/unity-switch.conf +++ b/tests/scripts/unity-switch.conf @@ -15,17 +15,17 @@ user-session=default #?*UNITY-SYSTEM-COMPOSITOR READY # X server starts -#?XSERVER-0 START SEAT=seat0 MIR-ID=x-0 +#?XMIR-0 START SEAT=seat0 MIR-ID=x-0 # Daemon connects when X server is ready -#?*XSERVER-0 INDICATE-READY -#?XSERVER-0 INDICATE-READY -#?XSERVER-0 ACCEPT-CONNECT +#?*XMIR-0 INDICATE-READY +#?XMIR-0 INDICATE-READY +#?XMIR-0 ACCEPT-CONNECT # Session starts #?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c0 -#?XSERVER-0 ACCEPT-CONNECT +#?XMIR-0 ACCEPT-CONNECT #?SESSION-X-0 CONNECT-XSERVER # System compositor switches to session @@ -36,12 +36,12 @@ user-session=default #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER-1 START SEAT=seat0 MIR-ID=x-1 +#?XMIR-1 START SEAT=seat0 MIR-ID=x-1 # Daemon connects when X server is ready -#?*XSERVER-1 INDICATE-READY -#?XSERVER-1 INDICATE-READY -#?XSERVER-1 ACCEPT-CONNECT +#?*XMIR-1 INDICATE-READY +#?XMIR-1 INDICATE-READY +#?XMIR-1 ACCEPT-CONNECT # Lock session #?LOGIN1 LOCK-SESSION SESSION=c0 @@ -49,7 +49,7 @@ user-session=default # Greeter starts #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter #?LOGIN1 ACTIVATE-SESSION SESSION=c1 -#?XSERVER-1 ACCEPT-CONNECT +#?XMIR-1 ACCEPT-CONNECT #?GREETER-X-1 CONNECT-XSERVER #?GREETER-X-1 CONNECT-TO-DAEMON #?GREETER-X-1 CONNECTED-TO-DAEMON @@ -66,23 +66,23 @@ user-session=default # New session starts #?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1 #?LOGIN1 ACTIVATE-SESSION SESSION=c2 -#?XSERVER-1 ACCEPT-CONNECT +#?XMIR-1 ACCEPT-CONNECT #?SESSION-X-1 CONNECT-XSERVER # Logout of new session #?*SESSION-X-1 LOGOUT -#?XSERVER-1 TERMINATE SIGNAL=15 +#?XMIR-1 TERMINATE SIGNAL=15 # X server starts -#?XSERVER-2 START SEAT=seat0 MIR-ID=x-2 -#?*XSERVER-2 INDICATE-READY -#?XSERVER-2 INDICATE-READY -#?XSERVER-2 ACCEPT-CONNECT +#?XMIR-2 START SEAT=seat0 MIR-ID=x-2 +#?*XMIR-2 INDICATE-READY +#?XMIR-2 INDICATE-READY +#?XMIR-2 ACCEPT-CONNECT # Greeter starts #?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter #?LOGIN1 ACTIVATE-SESSION SESSION=c3 -#?XSERVER-2 ACCEPT-CONNECT +#?XMIR-2 ACCEPT-CONNECT #?GREETER-X-2 CONNECT-XSERVER #?GREETER-X-2 CONNECT-TO-DAEMON #?GREETER-X-2 CONNECTED-TO-DAEMON @@ -93,8 +93,8 @@ user-session=default # Cleanup #?*STOP-DAEMON #?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 +#?XMIR-0 TERMINATE SIGNAL=15 #?GREETER-X-2 TERMINATE SIGNAL=15 -#?XSERVER-2 TERMINATE SIGNAL=15 +#?XMIR-2 TERMINATE SIGNAL=15 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 |