From: yomguy <>
Date: Thu, 8 Jul 2010 23:31:34 +0000 (+0000)
Subject: rn dir
X-Git-Tag: 1.0~185
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2f0ca09fa5d1939bcaacd3df46633ede51c2b56a;p=telecaster-server.git

rn dir
---

diff --git a/conf/home/vnc/xstartup b/conf/home/vnc/xstartup
new file mode 100755
index 0000000..416bd91
--- /dev/null
+++ b/conf/home/vnc/xstartup
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Uncomment the following two lines for normal desktop:
+# unset SESSION_MANAGER
+# exec /etc/X11/xinit/xinitrc
+
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
+xsetroot -solid grey
+#xset s 0
+vncconfig -iconic &
+#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
+#x-window-manager &
+#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S &
+fluxbox &
+
diff --git a/conf/home/vncserver/xstartup b/conf/home/vncserver/xstartup
deleted file mode 100755
index 416bd91..0000000
--- a/conf/home/vncserver/xstartup
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Uncomment the following two lines for normal desktop:
-# unset SESSION_MANAGER
-# exec /etc/X11/xinit/xinitrc
-
-[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
-xsetroot -solid grey
-#xset s 0
-vncconfig -iconic &
-#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
-#x-window-manager &
-#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S &
-fluxbox &
-