summaryrefslogtreecommitdiff
path: root/daemon/gdm-server.c
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-03-07 08:38:50 -0500
committerRay Strode <rstrode@redhat.com>2014-03-14 19:02:49 -0400
commitdb8226e5c491556c8d0649c5c8cd3a2edd9c6f94 (patch)
tree966fc18e0ea06740317bc6f746086dd3e26f1a57 /daemon/gdm-server.c
parentc95e9236d64811f254eb13accb9670e393bfee16 (diff)
downloadgdm-db8226e5c491556c8d0649c5c8cd3a2edd9c6f94.tar.gz
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. https://bugzilla.gnome.org/show_bug.cgi?id=726380
Diffstat (limited to 'daemon/gdm-server.c')
-rw-r--r--daemon/gdm-server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index b58f2b0e..4363e457 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