vmchooser:

 * various changes to run-virt.sh
 * new vmchooser binary puts path of xml file to image_name node

xserver:
 * suse-gfx-install: new link for ati drivers
 * XX_xserver: fixed path



git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2645 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 22 insertions, 12 deletions

diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh
index 759709e2..0a9919c2 100644
--- a/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -29,32 +29,29 @@
 xml=$1
 [ -e "${xml}" ] || { echo -e "\n\tNo XML file given!\n"; exit 1; }
 
-# path to the xml file(just take the path to the xml file)
-imagepath=${xml%/*}
-
 # Read needed variables from XML file
 ###############################################################################
 
 # file name of the image
-imagename=$(grep -i "<image_name param=\"" ${xml} | awk -F "\"" '{ print $2 }')
-diskfile=$imagepath/$imagename
+imagename=$(grep -io "<image_name param=.*\"" ${xml} | awk -F "\"" '{ print $2 }')
+diskfile=$imagename
 [ -e $diskfile ] || { echo -e "\n\tImage file $diskfile not found!"; exit 1; }
 
 # short description of the image (as present in the vmchooser menu line)
-short_description=$(grep "short_description param=\"" ${xml} | \
+short_description=$(grep -o "short_description param=.*\"" ${xml} | \
   sed -e "s/&.*;/; /g" | awk -F "\"" '{print $2}')
 # if ${short_description} not defined use ${image_name}
 short_description=${short_description:-"${image_name}"}
 displayname=${short_description}
 
 # type of virtual machine to run
-virt_mach=$(grep "virtualmachine param=\"" ${xml} | \
+virt_mach=$(grep -o "virtualmachine param=.*\"" ${xml} | \
   sed -e "s/&.*;/; /g" | awk -F "\"" '{print $2}')
 
 # make a guess from the filename extension if ${virt_mach} is empty (not set
 # within the xml file)
 if [ -z ${virt_mach} ] ; then
-  case "${imagename#*.}" in
+  case "${imagename##*.}" in
     vmdk|VMDK)
       virt_mach="vmware"
     ;;
@@ -68,13 +65,13 @@ if [ -z ${virt_mach} ] ; then
 fi
 
 # definition of the client system
-vmostype=$(grep -i "<os param=\"" ${xml} | awk -F "\"" '{ print $2 }')
+vmostype=$(grep -io "<os param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 
 # definition of the networking the client system is connected to
-network_kind=$(grep -i "<network param=\"" ${xml} | awk -F "\"" '{ print $2 }')
+network_kind=$(grep -io "<network param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 
 # serial port defined (e.g. "ttyS0" or "autodetect")
-serial=$(grep -i "<serial port=\"" ${xml} | awk -F "\"" '{ print $2 }')
+serial=$(grep -io "<serial port=\"" ${xml} | awk -F "\"" '{ print $2 }')
 
 
 # declaration of default variables
diff --git a/os-plugins/plugins/vmchooser/files/vmchooser b/os-plugins/plugins/vmchooser/files/vmchooser
index 2518b774..2a91665c 100644
--- a/os-plugins/plugins/vmchooser/files/vmchooser
+++ b/os-plugins/plugins/vmchooser/files/vmchooser
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 18c671c3..ceac1f22 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -69,7 +69,7 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \
 	      cp -r ${PLUGIN_PATH}/etc/* /mnt/etc
 	
 	      # if fglrx_dri.so is linked wrong -> we have to link it here
-	      if [ "1" -eq "$( ls -l /usr/lib/dri/fglrx_dri.so \
+	      if [ "1" -eq "$( ls -l /mnt/usr/lib/dri/fglrx_dri.so \
 	        | grep -o "/var/X11R6.*so$" | wc -l )" ]; then
 	          ln -s ${PLUGIN_ROOTFS}/usr/lib/dri/fglrx_dri.so \
 	            ${glliblinks}dri/fglrx_dri.so
diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
index eb985f47..d1f41c90 100755
--- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
@@ -245,6 +245,7 @@ if [ "$1" = "ati" ]; then
     cd ..
     rm -rf ${PKG}
 
+
     buildfglrx ${KVERS}
 
   ;;
@@ -296,6 +297,18 @@ if [ "$1" = "ati" ]; then
   esac
   cd ..
 
+  # OpenGl implementation (libGL?) expect fglrx_dri.so in /usr/X11R6/lib/dri/
+  if [ ! -f /usr/X11R6/lib/modules/dri/fglrx_dri.so -a \
+   ! -f usr/X11R6/lib/modules/dri/fglrx_dri.so ]; then
+    if [ ! -d /usr/X11R6/lib/modules/dri ]; then
+	  mkdir -p /usr/X11R6/lib/modules/dri
+	fi
+	if [ -f usr/lib/dri/fglrx_dri.so ]; then
+	  ln -s ${BASE}/ati/usr/lib/dri/fglrx_dri.so \
+	  /usr/X11R6/lib/modules/dri/fglrx_dri.so
+	fi
+  fi
+
   rm -rf temp/
 fi