diff --git a/include/opaque.h b/include/opaque.h index 893db7807..7f031809b 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -54,7 +54,6 @@ extern _X_EXPORT Bool disableBackingStore; extern _X_EXPORT Bool enableBackingStore; extern _X_EXPORT Bool enableIndirectGLX; extern _X_EXPORT Bool PartialNetwork; -extern _X_EXPORT Bool RunFromSigStopParent; #ifdef RLIMIT_DATA extern _X_EXPORT int limitDataSpace; diff --git a/os/connection.c b/os/connection.c index 0936d5a03..a726717f9 100644 --- a/os/connection.c +++ b/os/connection.c @@ -121,8 +121,6 @@ struct ospoll *server_poll; Bool NewOutputPending; /* not yet attempted to write some new output */ Bool NoListenAll; /* Don't establish any listening sockets */ -Bool RunFromSigStopParent; /* send SIGSTOP to our own process; Upstart (or - equivalent) will send SIGCONT back. */ static char dynamic_display[7]; /* display name */ Bool PartialNetwork; /* continue even if unable to bind all addrs */ #if !defined(WIN32) @@ -205,8 +203,6 @@ NotifyParentProcess(void) kill(ParentProcess, SIGUSR1); } } - if (RunFromSigStopParent) - raise(SIGSTOP); #ifdef HAVE_SYSTEMD_DAEMON /* If we have been started as a systemd service, tell systemd that we are ready. Otherwise sd_notify() won't do anything. */ diff --git a/os/utils.c b/os/utils.c index 469d6f124..0c788dcbb 100644 --- a/os/utils.c +++ b/os/utils.c @@ -580,7 +580,6 @@ UseMsg(void) #endif ErrorF("-dumbSched Disable smart scheduling and threaded input, enable old behavior\n"); ErrorF("-schedInterval int Set scheduler interval in msec\n"); - ErrorF("-sigstop Enable SIGSTOP based startup\n"); ErrorF("+extension name Enable extension\n"); ErrorF("-extension name Disable extension\n"); ListStaticExtensions(); @@ -1031,9 +1030,6 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } - else if (strcmp(argv[i], "-sigstop") == 0) { - RunFromSigStopParent = TRUE; - } else if (strcmp(argv[i], "+extension") == 0) { if (++i < argc) { if (!EnableDisableExtension(argv[i], TRUE))