* small fix

* move xml file we get from vmchooser to the windows disk drive B:
  vmchooser gets this file from the server and modifies it (adding scanner etc).


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

2 files changed, 36 insertions, 32 deletions

diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v1 b/os-plugins/plugins/vmware/files/runvmware-player-v1
index a3330bf5..44c61a7c 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v1
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v1
@@ -28,8 +28,8 @@ imagename=$(grep -i "<image_name param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 #iconv -c -f utf-8 -t utf-8 < ${xml} > ${xml}.utf
 short_description=$(grep "short_description param=\"" ${xml}
     sed -e "s%&.*;%; %g" | awk -F "\"" '{print $2}')
-# if ${short_description} not defined use ${image}
-short_description=${short_description:-"${image}"}
+# if ${short_description} not defined use ${image_name}
+short_description=${short_description:-"${image_name}"}
 displayname=${short_description}
 
 # Definition of the client system
@@ -527,21 +527,23 @@ runvmwareconfheader
 #sed -e "s/HOSTNAME/${hostname}/" \
 #    -e "s/USER/${USER}/" /var/lib/vmware/templates/client-config.xml.default \
 #    > /etc/vmware/fd-loop/config.xml
-echo "<settings>" > /etc/vmware/fd-loop/config.xml
-echo "  <eintrag>" >> /etc/vmware/fd-loop/config.xml
-echo "   <computername param=\"${hostname}\">" >> /etc/vmware/fd-loop/config.xml
-echo "   </computername>" >> /etc/vmware/fd-loop/config.xml
-echo "   <username param=\"${USER}\">" >> /etc/vmware/fd-loop/config.xml
-echo "   </username>" >> /etc/vmware/fd-loop/config.xml
+#echo "<settings>" > /etc/vmware/fd-loop/config.xml
+#echo "  <eintrag>" >> /etc/vmware/fd-loop/config.xml
+#echo "   <computername param=\"${hostname}\">" >> /etc/vmware/fd-loop/config.xml
+#echo "   </computername>" >> /etc/vmware/fd-loop/config.xml
+#echo "   <username param=\"${USER}\">" >> /etc/vmware/fd-loop/config.xml
+#echo "   </username>" >> /etc/vmware/fd-loop/config.xml
 # if we have a scanner, then copy scannerinformation to this xml
-sanelines="$(wc -l /etc/sane.d/net.conf|awk '{ print $1 };')"
-if [ -f /etc/sane.d/net.conf ] && [ "${sanelines}" -eq 1 ]; then
-  echo "<scanner param=\"$(cat /etc/sane.d/net.conf)\">" \
-     >> /etc/vmware/fd-loop/config.xml
-  echo "</scanner>" >> /etc/vmware/fd-loop/config.xml
-fi
-echo "  </eintrag>" >> /etc/vmware/fd-loop/config.xml
-echo "</settings>" >> /etc/vmware/fd-loop/config.xml
+#sanelines="$(wc -l /etc/sane.d/net.conf|awk '{ print $1 };')"
+#if [ -f /etc/sane.d/net.conf ] && [ "${sanelines}" -eq 1 ]; then
+#  echo "<scanner param=\"$(cat /etc/sane.d/net.conf)\">" \
+#     >> /etc/vmware/fd-loop/config.xml
+#  echo "</scanner>" >> /etc/vmware/fd-loop/config.xml
+#fi
+#echo "  </eintrag>" >> /etc/vmware/fd-loop/config.xml
+#echo "</settings>" >> /etc/vmware/fd-loop/config.xml
+# copy config file we get from vmchooser
+cp ${xml} /etc/vmware/fd-loop/config.xml
 
 
 # sync is needed to ensure that data is really written to virtual disk
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2
index a3330bf5..44c61a7c 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v2
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v2
@@ -28,8 +28,8 @@ imagename=$(grep -i "<image_name param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 #iconv -c -f utf-8 -t utf-8 < ${xml} > ${xml}.utf
 short_description=$(grep "short_description param=\"" ${xml}
     sed -e "s%&.*;%; %g" | awk -F "\"" '{print $2}')
-# if ${short_description} not defined use ${image}
-short_description=${short_description:-"${image}"}
+# if ${short_description} not defined use ${image_name}
+short_description=${short_description:-"${image_name}"}
 displayname=${short_description}
 
 # Definition of the client system
@@ -527,21 +527,23 @@ runvmwareconfheader
 #sed -e "s/HOSTNAME/${hostname}/" \
 #    -e "s/USER/${USER}/" /var/lib/vmware/templates/client-config.xml.default \
 #    > /etc/vmware/fd-loop/config.xml
-echo "<settings>" > /etc/vmware/fd-loop/config.xml
-echo "  <eintrag>" >> /etc/vmware/fd-loop/config.xml
-echo "   <computername param=\"${hostname}\">" >> /etc/vmware/fd-loop/config.xml
-echo "   </computername>" >> /etc/vmware/fd-loop/config.xml
-echo "   <username param=\"${USER}\">" >> /etc/vmware/fd-loop/config.xml
-echo "   </username>" >> /etc/vmware/fd-loop/config.xml
+#echo "<settings>" > /etc/vmware/fd-loop/config.xml
+#echo "  <eintrag>" >> /etc/vmware/fd-loop/config.xml
+#echo "   <computername param=\"${hostname}\">" >> /etc/vmware/fd-loop/config.xml
+#echo "   </computername>" >> /etc/vmware/fd-loop/config.xml
+#echo "   <username param=\"${USER}\">" >> /etc/vmware/fd-loop/config.xml
+#echo "   </username>" >> /etc/vmware/fd-loop/config.xml
 # if we have a scanner, then copy scannerinformation to this xml
-sanelines="$(wc -l /etc/sane.d/net.conf|awk '{ print $1 };')"
-if [ -f /etc/sane.d/net.conf ] && [ "${sanelines}" -eq 1 ]; then
-  echo "<scanner param=\"$(cat /etc/sane.d/net.conf)\">" \
-     >> /etc/vmware/fd-loop/config.xml
-  echo "</scanner>" >> /etc/vmware/fd-loop/config.xml
-fi
-echo "  </eintrag>" >> /etc/vmware/fd-loop/config.xml
-echo "</settings>" >> /etc/vmware/fd-loop/config.xml
+#sanelines="$(wc -l /etc/sane.d/net.conf|awk '{ print $1 };')"
+#if [ -f /etc/sane.d/net.conf ] && [ "${sanelines}" -eq 1 ]; then
+#  echo "<scanner param=\"$(cat /etc/sane.d/net.conf)\">" \
+#     >> /etc/vmware/fd-loop/config.xml
+#  echo "</scanner>" >> /etc/vmware/fd-loop/config.xml
+#fi
+#echo "  </eintrag>" >> /etc/vmware/fd-loop/config.xml
+#echo "</settings>" >> /etc/vmware/fd-loop/config.xml
+# copy config file we get from vmchooser
+cp ${xml} /etc/vmware/fd-loop/config.xml
 
 
 # sync is needed to ensure that data is really written to virtual disk