From: Michael Prokop <mika@grml.org>
Date: Sat, 12 Dec 2009 12:19:32 +0000 (+0100)
Subject: /etc/skel/.xinitrc: Add support for VNC
X-Git-Tag: v1.1.30^0
X-Git-Url: http://git.grml.org/?p=grml-etc.git;a=commitdiff_plain;h=50d3e8e6b974b75cfe1df978b1a9a46b7f18eb8f

/etc/skel/.xinitrc: Add support for VNC
---

diff --git a/debian/changelog b/debian/changelog
index 7a6f7f9..46a293d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc (1.1.30) unstable; urgency=low
+
+  * /etc/skel/.xinitrc: Add support for VNC. Thanks to formorer
+    for the patch. [Closes: issue781]
+
+ -- Michael Prokop <mika@grml.org>  Sat, 12 Dec 2009 13:18:51 +0100
+
 grml-etc (1.1.29) unstable; urgency=low
 
   * Update /etc/runlevel.conf.livecd* to support grml-udev-config.
diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index 8b5938d..e3c7310 100755
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -70,6 +70,12 @@
 # start browser with startpage.html, but only in live-cd mode
   [ -r /etc/grml_cd ] && grml-info &
 
+# if the vnc bootoption sets up the password let's start the vnc server
+  if [ -e $HOME/.vnc/passwd ]; then
+     /usr/bin/x11vnc -bg -forever -noxdamage -o $HOME/.vnc/x11vnc.log -rfbauth \
+                     $HOME/.vnc/passwd -auth $HOME/.Xauthority -display $DISPLAY
+  fi
+
 # default entry, use e.g. 'grml-x windowmanager' for changing or just adjust manually
   exec /usr/bin/x-window-manager