diff options
| -rw-r--r-- | AUTHORS | 17 | ||||
| -rw-r--r-- | os-plugins/plugins/x11vnc/OpenSLX/OSPlugin/x11vnc.pm | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/x11vnc/XX_x11vnc.sh | 23 | ||||
| -rw-r--r-- | os-plugins/plugins/xserver/XX_xserver.sh | 9 |
4 files changed, 35 insertions, 20 deletions
@@ -1,13 +1,16 @@ Authors are named in the row of entry dates into the OpenSLX project. -Dirk von Suchodoletz, <dvs@OpenSLX.com>, 2002 - 2008 -Michael Janczyk, <>, 2003 - 2008 +Dirk von Suchodoletz, <dvs@OpenSLX.com>, 2002 - 2009 +Michael Janczyk, <>, 2003 - 2009 Nico Dietrich, <>, 2005 - 2006 Felix Endres, <>, 2005 - 2007 Tobias Maier, <>, 2005 - 2006 -Bastian Wissler, <>, 2006 - 2008 -Lars Mueller, <lm@OpenSLX.com>, 2006 - 2008 -Oliver Tappe, <ot@OpenSLX.com>, 2006 - 2008 -Volker Uhrig, <>, 2007 - 2008 -Sebastian Schmelzer, <>, 2007 - 2008 +Bastian Wissler, <>, 2006 - 2009 +Lars Mueller, <lm@OpenSLX.com>, 2006 - 2009 +Oliver Tappe, <ot@OpenSLX.com>, 2006 - 2009 +Volker Uhrig, <>, 2007 - 2009 +Sebastian Schmelzer, <>, 2007 - 2009 +Marco Haustein, <>, 2007 - 2008 +Julian Bader, <>, 2008 - 2009 +Alexander Hoppe, <>, 2009 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 |