From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 9 Dec 2019 12:54:17 +0000 (+0100)
Subject: Don't background the main session command
X-Git-Tag: v1.10.90~81
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38fe6d08e12457250f60e7b8b7c70c1d67f7c088;p=tigervnc.git

Don't background the main session command

When used with -fg we expect the startup script to remain running until
the session is over. This will not happen if the session command is put
in the background using &.
---

diff --git a/unix/vncserver b/unix/vncserver
index 68be032d..c98fb91f 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -78,7 +78,7 @@ $defaultXStartup
        "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
        "xsetroot -solid grey\n".
        "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
-       "twm &\n");
+       "twm\n");
 
 $defaultConfig
     = ("## Supported server options to pass to vncserver upon invocation can be listed\n".