diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2016-01-25 17:04:27 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2016-01-25 17:04:27 +1300 |
| commit | cf6c9ec43d042a7f5400f1f42e6519883e2d55e8 (patch) | |
| tree | 2f0f14a9fa76b606fe786bd9ab2052b03cccb981 | |
| parent | bce41ecf45988e91629778c348cb90c8277ee27a (diff) | |
| download | lightdm-cf6c9ec43d042a7f5400f1f42e6519883e2d55e8.tar.gz | |
Fix dm-tool add-local-seat not working because LightDM is trying to connect with TCP/IP
| -rw-r--r-- | src/seat-xremote.c | 4 | ||||
| -rw-r--r-- | tests/scripts/add-local-x-seat.conf | 10 | ||||
| -rw-r--r-- | tests/scripts/xremote-autologin.conf | 1 | ||||
| -rw-r--r-- | tests/scripts/xremote-login.conf | 1 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/seat-xremote.c b/src/seat-xremote.c index e860e9f3..efc8135d 100644 --- a/src/seat-xremote.c +++ b/src/seat-xremote.c @@ -40,11 +40,9 @@ seat_xremote_create_display_server (Seat *seat, Session *session) } hostname = seat_get_string_property (seat, "xserver-hostname"); - if (!hostname) - hostname = "127.0.0.1"; number = seat_get_integer_property (seat, "xserver-display-number"); - l_debug (seat, "Starting remote X display %s:%d", hostname, number); + l_debug (seat, "Starting remote X display %s:%d", hostname ? hostname : "", number); x_server = x_server_remote_new (hostname, number, NULL); diff --git a/tests/scripts/add-local-x-seat.conf b/tests/scripts/add-local-x-seat.conf index 97db415c..09a1f562 100644 --- a/tests/scripts/add-local-x-seat.conf +++ b/tests/scripts/add-local-x-seat.conf @@ -32,16 +32,16 @@ #?XSERVER-98 ACCEPT-CONNECT # Greeter starts -#?GREETER-X-127.0.0.1:98 START XDG_SEAT=xremote0 XDG_SESSION_CLASS=greeter +#?GREETER-X-98 START XDG_SEAT=xremote0 XDG_SESSION_CLASS=greeter #?LOGIN1 ACTIVATE-SESSION SESSION=c1 #?XSERVER-98 ACCEPT-CONNECT -#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER -#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON -#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON +#?GREETER-X-98 CONNECT-XSERVER +#?GREETER-X-98 CONNECT-TO-DAEMON +#?GREETER-X-98 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON #?GREETER-X-0 TERMINATE SIGNAL=15 -#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15 +#?GREETER-X-98 TERMINATE SIGNAL=15 #?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xremote-autologin.conf b/tests/scripts/xremote-autologin.conf index 45ebaea9..41a8ec74 100644 --- a/tests/scripts/xremote-autologin.conf +++ b/tests/scripts/xremote-autologin.conf @@ -6,6 +6,7 @@ type=xremote autologin-user=have-password1 user-session=default +xserver-hostname=127.0.0.1 xserver-display-number=98 # Start a remote X server to use diff --git a/tests/scripts/xremote-login.conf b/tests/scripts/xremote-login.conf index e8af8311..212139c1 100644 --- a/tests/scripts/xremote-login.conf +++ b/tests/scripts/xremote-login.conf @@ -5,6 +5,7 @@ [Seat:*] type=xremote user-session=default +xserver-hostname=127.0.0.1 xserver-display-number=98 # Start a remote X server to use |