From e8e59f5a3810ebe514d9bde6946819ae4d84a0e6 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Wed, 6 May 2009 13:54:52 +0000
Subject: xserver plugin:  * added NoLogo-Option for "nvidia" driver

vmchooser plugin:
 * xmlfilter now supports only exactly match of pool groups


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2843 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmchooser/files/xmlfilter.sh | 2 +-
 os-plugins/plugins/xserver/XX_xserver.sh        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/os-plugins/plugins/vmchooser/files/xmlfilter.sh b/os-plugins/plugins/vmchooser/files/xmlfilter.sh
index 1b724ddd..7b3a3ac5 100755
--- a/os-plugins/plugins/vmchooser/files/xmlfilter.sh
+++ b/os-plugins/plugins/vmchooser/files/xmlfilter.sh
@@ -34,7 +34,7 @@ if [ -n ${vmchooser_env} ]; then
   for FILE in $1/*.xml
   do
     # filter all xmls with pool-param not equal to slxgroup
-    if [ $(grep "<pools param=\".*${vmchooser_env}.*\"" ${FILE} | wc -l) -eq 1 ]; then
+    if [ $(grep "<pools param=\"${vmchooser_env}\"" ${FILE} | wc -l) -eq 1 ]; then
       echo ${FILE};
     fi
   done
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 614fbf0a..d4218d9b 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -251,6 +251,10 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents"
 
       # just in case somebody needs to run ldconfig - insert GL-Libs at the beginning
       sed -e "1s,^,include ${PLUGIN_ROOTFS}/ld.so.conf\n,g" -i /mnt/etc/ld.so.conf 
+
+      if [ "${xmodule}" = "nvidia" ]; then
+        sed -i "s,\(Driver.*\"nvidia\"\),\1\n  Option \"NoLogo\" \"True\"," $xfc
+      fi
     fi
  
     # check if tablet hardware available, read device information from file
-- 
cgit v1.2.3-55-g7522