Launch vncconfig directly from vncserver, not from xstartup. Justification: vncconf...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4709 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/vncserver b/unix/vncserver
index 3d629ed564725a0b9d2ffeb95c39ad456c2f75d3..85140350dbe4cec7a4dffe43a373349d041af84d 100755 (executable)
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -57,7 +57,6 @@ $xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority";
 
 $defaultXStartup
     = ("#!/bin/sh\n\n".
-       "vncconfig -iconic &\n".
        "unset SESSION_MANAGER\n".
        "unset DBUS_SESSION_BUS_ADDRESS\n".
        "OS=`uname -s`\n".
@@ -338,6 +337,8 @@ if (-e "/tmp/.X11-unix/X$displayNumber" ||
 }
 $ENV{VNCDESKTOP}= $desktopName;
 
+system($exedir."vncconfig -iconic >> " . &quotedString($desktopLog) . " 2>&1 &");
+
 if ($opt{'-fg'}) {
     system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1");
     if (kill 0, `cat $pidFile`) {