41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
diff --git a/unix/vncserver b/unix/vncserver
|
|
index bb4f2feb..b038dd3b 100755
|
|
--- a/unix/vncserver
|
|
+++ b/unix/vncserver
|
|
@@ -58,27 +58,14 @@ $defaultXStartup
|
|
= ("#!/bin/sh\n\n".
|
|
"unset SESSION_MANAGER\n".
|
|
"unset DBUS_SESSION_BUS_ADDRESS\n".
|
|
- "OS=`uname -s`\n".
|
|
- "if [ \$OS = 'Linux' ]; then\n".
|
|
- " case \"\$WINDOWMANAGER\" in\n".
|
|
- " \*gnome\*)\n".
|
|
- " if [ -e /etc/SuSE-release ]; then\n".
|
|
- " PATH=\$PATH:/opt/gnome/bin\n".
|
|
- " export PATH\n".
|
|
- " fi\n".
|
|
- " ;;\n".
|
|
- " esac\n".
|
|
- "fi\n".
|
|
- "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
|
|
- " exec /etc/X11/xinit/xinitrc\n".
|
|
- "fi\n".
|
|
- "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
|
|
- " exec sh /etc/X11/xinit/xinitrc\n".
|
|
- "fi\n".
|
|
- "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
|
|
- "xsetroot -solid grey\n".
|
|
- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
|
|
- "twm &\n");
|
|
+ "/etc/X11/xinit/xinitrc\n".
|
|
+ "# Assume either Gnome will be started by default when installed\n".
|
|
+ "# We want to kill the session automatically in this case when user logs out. In case you modify\n".
|
|
+ "# /etc/X11/xinit/Xclients or ~/.Xclients yourself to achieve a different result, then you should\n".
|
|
+ "# be responsible to modify below code to avoid that your session will be automatically killed\n".
|
|
+ "if [ -e /usr/bin/gnome-session ]; then\n".
|
|
+ " vncserver -kill \$DISPLAY\n".
|
|
+ "fi\n");
|
|
|
|
$defaultConfig
|
|
= ("## Supported server options to pass to vncserver upon invocation can be listed\n".
|