xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/os-support/linux/systemd-logind.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 718223d27452862eedcf1bee6278eae6040d45ea
Author: Laércio de Sousa <laerciosousa at sme-mogidascruzes.sp.gov.br>
Date:   Thu Dec 3 08:05:59 2015 -0200

    systemd-logind.c: don't parse VT settings for non-seat0 X servers
    
    Since non-seat0 X servers no longer touch VTs, I believe these settings
    are unnecessary.
    
    Signed-off-by: Laércio de Sousa <laerciosousa at sme-mogidascruzes.sp.gov.br>
    Reviewed-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
index 2612d9e..13784d1 100644
--- a/hw/xfree86/os-support/linux/systemd-logind.c
+++ b/hw/xfree86/os-support/linux/systemd-logind.c
@@ -38,6 +38,7 @@
 #include "xf86.h"
 #include "xf86platformBus.h"
 #include "xf86Xinput.h"
+#include "globals.h"
 
 #include "systemd-logind.h"
 
@@ -615,7 +616,7 @@ static struct dbus_core_hook core_hook = {
 int
 systemd_logind_init(void)
 {
-    if (linux_parse_vt_settings(TRUE) && !linux_get_keeptty()) {
+    if (!ServerIsNotSeat0() && linux_parse_vt_settings(TRUE) && !linux_get_keeptty()) {
         LogMessage(X_INFO,
             "systemd-logind: logind integration requires -keeptty and "
             "-keeptty was not provided, disabling logind integration\n");