Merge lp:~robert-ancell/lightdm/unity-assign-usc-vt into lp:~mir-team/lightdm/unity

[Robert Ancell]

Make system compositor start on required VT

[Robert Ancell (robert-ancell)]

Requires https://code.launchpad.net/~robert-ancell/mir/vt-option/+merge/170476 to land first.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1625
http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-saucy-amd64-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-lightdm-unity-ci/24/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-autolanding/18/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/413/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-saucy-amd64-autolanding/17/console

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/unity-assign-usc-vt]

1626. By Robert Ancell on 2013-06-24

Merge with unity branch

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/seat-unity.c'
--- src/seat-unity.c	2013-06-21 03:42:40 +0000
+++ src/seat-unity.c	2013-06-24 00:16:23 +0000
@@ -344,7 +344,7 @@
     SEAT_UNITY (seat)->priv->mir_socket_filename = g_strdup ("/tmp/mir_socket"); // FIXME: Use this socket by default as XMir is hardcoded to this
     timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
     compositor_command = seat_get_string_property (seat, "unity-compositor-command");
-    command = g_strdup_printf ("%s --from-dm-fd %d --to-dm-fd %d", compositor_command, SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1]);
+    command = g_strdup_printf ("%s --from-dm-fd %d --to-dm-fd %d --vt %d", compositor_command, SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1], SEAT_UNITY (seat)->priv->vt);
 
     absolute_command = get_absolute_command (command);
     g_free (command);

=== modified file 'tests/src/unity-system-compositor.c'
--- tests/src/unity-system-compositor.c	2013-06-21 03:42:40 +0000
+++ tests/src/unity-system-compositor.c	2013-06-24 00:16:23 +0000
@@ -151,6 +151,11 @@
             to_dm_fd = atoi (argv[i+1]);
             i++;
         }
+        else if (strcmp (arg, "--vt") == 0)
+        {
+            //vt_number = atoi (argv[i+1]);
+            i++;
+        }
         else if (strcmp (arg, "--test") == 0)
             test = TRUE;
         else