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

[grml-etc.git] / etc / skel / .xinitrc

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index a0fb306..e3c7310 100755 (executable)
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -19,7 +19,7 @@
 # print info text
   if [ -x /usr/bin/osd_cat ] ; then
      echo "Starting X window system and loading window manager..." | \
-     osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15" &
+     osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-15-150-*-*-c-*-iso8859-15" &
   fi
 
 # add at least one entry to xauth
@@ -39,6 +39,10 @@
 # other settings:
 # xset m 20/10 4
 
+# disable screensaver and dpms:
+# xset s off
+# xset -dpms
+
 # xresources
   [ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
 
@@ -47,7 +51,7 @@
      [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us
   else
      . /etc/sysconfig/keyboard
-     if [ $XKEYBOARD == "us" ] ; then
+     if [ "$XKEYBOARD" = "us" ] ; then
         [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
      else
         if [ -n "$XKEYMODEL" ] ; then
@@ -66,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