Don't start non-graphical seats

Author: robert-ancell

src/lightdm.c

@@ -944,6 +944,10 @@ add_login1_seat (Login1Seat *login1_seat)
     Seat *seat = NULL;
     gboolean is_seat0, started = FALSE;
 
+    /* We only create graphical seats */
+    if (!login1_seat_get_can_graphical (login1_seat))
+        return TRUE;
+
     g_debug ("New seat added from logind: %s", seat_name);
     is_seat0 = strcmp (seat_name, "seat0") == 0;
 

tests/Makefile.am

@@ -181,6 +181,7 @@ TESTS = \
 	test-open-file-descriptors \
 	test-xdmcp-server-open-file-descriptors \
 	test-multi-seat \
+	test-multi-seat-non-graphical \
 	test-mir-autologin \
 	test-mir-greeter \
 	test-mir-session \
@@ -444,6 +445,7 @@ EXTRA_DIST = \
 	scripts/mir-session-compositor-crash.conf \
 	scripts/mir-session-crash.conf \
 	scripts/multi-seat.conf \
+	scripts/multi-seat-non-graphical.conf \
 	scripts/no-accounts-service.conf \
 	scripts/no-config.conf \
 	scripts/no-console-kit.conf \

tests/scripts/multi-seat-non-graphical.conf

@@ -0,0 +1,30 @@
+#
+# Check non graphical seats are ignored
+#
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# seat0 starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Add seat1
+#?*ADD-SEAT ID=seat1 CAN-GRAPHICAL=FALSE
+
+# Check no seat is added
+#?*WAIT
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

tests/test-multi-seat-non-graphical

@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner multi-seat-non-graphical test-gobject-greeter