commit f6b584010328c2544ee3b1b1cfdf1f27f1cf7352
author DRC <dcommander@users.sourceforge.net> Wed Oct 05 21:28:03 2011 +0000
committer DRC <dcommander@users.sourceforge.net> Wed Oct 05 21:28:03 2011 +0000
tree 3eab3aed2078de25dd817c52308f6e57b26f1e8f
parent 8249d5cb488dd3787a9a4a9cef75a98310716051

Launch vncconfig directly from vncserver, not from xstartup.  Justification:  vncconfig is necessary to enable basic functionality of the TigerVNC system (clipboard transfer, most notably.)  It isn't always going to be in the PATH, and in fact, there might be more than one version of it on the system (for instance, a version from RealVNC in /usr/bin and a version from TigerVNC in /opt/TigerVNC/bin.)  If it is desirable to disable vncconfig under certain circumstances, then I would suggest adding a command-line option to vncserver to accomplish that.


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

unix/vncserver

diff --git a/unix/vncserver b/unix/vncserver
index 3d629ed..8514035 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -57,7 +57,6 @@
 
 $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 @@
 }
 $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`) {