[gdm/wip/wayland-for-merge: 5/21] server: Force server regeneration off

[Jasper St. Pierre <jstpierre src gnome org>]

commit da7f500b016ed48eaaa90a0a7086055105b7ed1f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Mar 7 08:38:50 2014 -0500

    server: Force server regeneration off
    
    Server regeneration causes Xorg to re-emit the SIGUSR1 signal, which
    *really* confuses our state machine. Since we also want to control
    the server lifetime fairly closely, it doesn't really make sense for
    it to ever trigger, so force it off.

 daemon/gdm-server.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index b58f2b0..4363e45 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -270,7 +270,7 @@ gdm_server_init_command (GdmServer *server)
                 debug_options = "";
         }
 
-#define X_SERVER_ARG_FORMAT " -background none -verbose %s%s"
+#define X_SERVER_ARG_FORMAT " -background none -noreset -verbose %s%s"
 
 #ifdef WITH_SYSTEMD