From 7c35b56f1acd67d7cdf33bc120dec9950f923146 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 11 Jan 2009 12:09:00 +0000
Subject: Fixes to x11vnc plugin, updated AUTHORS list.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2461 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 .../plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm      |  6 +++---
 os-plugins/plugins/x11vnc/XX_x11vnc.sh             | 23 +++++++++++++++-------
 os-plugins/plugins/xserver/XX_xserver.sh           |  9 ++++++---
 3 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm
index 98667c3a..43d7cb45 100644
--- a/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm
+++ b/os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm
@@ -66,9 +66,9 @@ sub getAttrInfo
                 access to the Xorg server (including displaymanager login) and
                 console framebuffer.
             End-of-Here
-            content_regex => qr{^(x11user|x11gen|fb)$},
-            content_descr => 'x11user for user, x11gen for general X access or fb',
-            default => 'x11gen',
+            content_regex => qr{^(x11user|x11mod|fb)$},
+            content_descr => 'x11user for user, x11mod for access via Xorg module or fb',
+            default => 'x11user',
         },
 
         'x11vnc::scale' => {
diff --git a/os-plugins/plugins/x11vnc/XX_x11vnc.sh b/os-plugins/plugins/x11vnc/XX_x11vnc.sh
index 98c29cce..2c58665e 100644
--- a/os-plugins/plugins/x11vnc/XX_x11vnc.sh
+++ b/os-plugins/plugins/x11vnc/XX_x11vnc.sh
@@ -19,10 +19,15 @@
 # function to add vnc functionality to xorg server
 addvnc2xorg () {
   sed -e '/^# autog/a# modified by x11vnc plugin (adding vnc module config)' \
-      -e '/\"Module\"/a\\ \\ Load         "vnc"' \
-      -e '/\"Device\"/a\\ \\ Option       "rfbauth"\t "/etc/X11"' \
-      -e '/\"Device\"/a\\ \\ Option       "usevnc"\t   "yes"}' \
+      -e '/\"Module\"/a\\ \ Load         "vnc"' \
+      -e '/n \"Device\"/a\\ \ Option       "usevnc"            "yes"' \
+      -e '/n \"Device\"/a\\ \ Option       "rfbauth"           "/etc/X11/vncpasswd"' \
       -i /mnt/etc/X11/xorg.conf
+  # password setting
+  echo "$x11vnc_pass" > /mnt/etc/X11/vncpasswd
+  echo -e "__BEGIN_VIEWONLY__\n$x11vnc_viewonlypass" >> /mnt/etc/X11/vncpasswd
+  # multiuser handling
+  sed -i "s/,/\n/" /mnt/etc/X11/vncpasswd
 }
 
 # main script
@@ -97,7 +102,7 @@ if [ -e /initramfs/plugin-conf/x11vnc.conf ]; then
 
       # scale desktop
       if [ "$x11vnc_scale" != "" ]; then
-        $PARAMS="$PARAMS -scale $x11vnc_scale"
+        PARAMS="$PARAMS -scale $x11vnc_scale"
       fi
 
       # write config file
@@ -109,8 +114,12 @@ if [ -e /initramfs/plugin-conf/x11vnc.conf ]; then
 
       [ $DEBUGLEVEL -gt 0 ] && echo "done with 'x11vnc' os-plugin ...";
 
-  # x11gen allows a general access to the running X server at every time
-  elif [ "$x11vnc_mode" = "x11gen" ]
-    ( waitfor /mnt/etc/X11/xorg.conf 10000; addvnc2xorg ) &
+    # x11mod offers access to the running X server via module
+    elif [ "$x11vnc_mode" = "x11mod" ]; then
+      ( waitfor /mnt/etc/X11/xorg.conf 10000; addvnc2xorg ) &
+    fi
   fi
+else
+  [ $DEBUGLEVEL -gt 2 ] && \
+    echo "No configuration file found for x11vnc plugin."
 fi
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 80b4cee6..ec4411bc 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -103,9 +103,9 @@ ${PLUGIN_ROOTFS}/usr/X11R6/lib/modules/\,"
     ######################################################################
 
 
-    echo -e "# $xfc\n# autogenerated X hardware configuration by the xserver \
-plugin in OpenSLX stage3\n# DO NOT EDIT THIS FILE BUT THE PLUGIN INSTEAD" \
-      > $xfc
+    echo -e "# ${xfc#/mnt*}\n# autogenerated X hardware configuration by the \
+xserver plugin in OpenSLX stage3\n# DO NOT EDIT THIS FILE BUT THE PLUGIN \
+INSTEAD" > $xfc
     echo '
 Section "Files"
   ModulePath "/usr/lib/xorg/modules/"
@@ -303,4 +303,7 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents"
     [ -e /mnt/opt/openslx/plugin-repo/xserver/xserver.sh ] && \
       . /mnt/opt/openslx/plugin-repo/xserver/xserver.sh
   fi
+elif [ ! -e /initramfs/plugin-conf/xserver.conf ]; then
+  [ $DEBUGLEVEL -gt 2 ] && \
+    echo "No configuration file found for xserver plugin."
 fi
-- 
cgit v1.2.3-55-g7522