From 2a3a857d9c208a4c61cee8a054ae8db1b480b992 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Mon, 9 Mar 2009 18:02:02 +0000
Subject: renamed and xml template and added xml comments start fvwm when
 vmplayer2+ is userd, otherwise windows start in the background x=0 and y=0
 upper left corner :(

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2702 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 .../files/Vorlage_VMwareImageAdministrator.xml     | 65 --------------------
 os-plugins/plugins/vmchooser/files/run-virt.sh     | 11 ++++
 os-plugins/plugins/vmchooser/files/vm-template.xml | 70 ++++++++++++++++++++++
 3 files changed, 81 insertions(+), 65 deletions(-)
 delete mode 100755 os-plugins/plugins/vmchooser/files/Vorlage_VMwareImageAdministrator.xml
 create mode 100755 os-plugins/plugins/vmchooser/files/vm-template.xml

(limited to 'os-plugins/plugins')

diff --git a/os-plugins/plugins/vmchooser/files/Vorlage_VMwareImageAdministrator.xml b/os-plugins/plugins/vmchooser/files/Vorlage_VMwareImageAdministrator.xml
deleted file mode 100755
index 9235c5fd..00000000
--- a/os-plugins/plugins/vmchooser/files/Vorlage_VMwareImageAdministrator.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<settings>
-  <eintrag>
-    # Imagename with proper suffix
-    <image_name param="Vorlage_VMwareImageAdministrator.vmdk">
-    </image_name>
-    # Information of the image creator
-    <creator param="Your Name">
-    </creator>
-    <email param="your@email.address.tld">
-    </email>
-    <phone param="---">
-    </phone>
-    # Short description, shown in the menu
-    <short_description param="Vorlagen-Image">
-    </short_description>
-    # Define long description shown when the Image is chosen
-    <long_description param="Diese Image dient Ihnen als Vorlage für Ihre Installationen. Laden Sie es auf Ihre lokale Festplatte und installieren Sie Ihre Programme!">
-    </long_description>
-    #os running in vmware, needed for vmware config file
-    <os param="winxppro">
-    </os>
-    # Network nat or bridged?
-    <network param="nat">
-    </network>
-    # values: vmware or virtualbox
-    <virtualmachine param="vmware">
-    </virtualmachine>
-    #Description: Should the current image in use? if yes value is "true"
-    <active param="true">
-    </active>
-    #Description: The ID of the user.
-    <username param="s8user">
-    </username>
-    #Description: where should the current image be used? in the past slxgrp
-    <pools param="default chemie">
-    </pools>
-    #Description: as xdm menu? If yes "true", else "false"
-    <xdm param="false">
-    </xdm>
-    #Description: priority, use a number to get it to a special position
-    # should only be used by our department and noone else
-    <priority param="1">
-    </priority>
-    #Description: Should printers be connected ? Which ?
-    <printers>
-     <printer name="" path="">Human readable description</printer>
-    </printers>
-    #Description: Should scanners be connected ? Which ?
-    <scanners>
-     <scanner name="" path="">Description</scanner>
-    </scanners>
-    #Description: Should the Homedrive be connected ?
-    <home param="true">
-    </home>
-    #Description: Should shared drives be connected ? Which ?
-    <shareds param="true">
-     <shared name="" path="" pass=""></shared>
-    </shareds>
-    # there is the ability to protect an image for a while using a
-    # password. Helpfull for courses (with special software licences).
-    <locked param="true">
-    </locked>
-  </eintrag>
-</settings>
diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh
index 5c14e591..65e61499 100644
--- a/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -217,6 +217,17 @@ filecheck
 # Get all virtual machine specific stuff from the respective include file
 if [ -e /etc/opt/openslx/run-${virt_mach}.include ] ; then
   . /etc/opt/openslx/run-${virt_mach}.include
+  # start fvwm for player 2+
+  # problems with windows opening in background
+  if [ "${virt_mach}" = "vmware" ]; then
+    case "$vmversion" in
+      2.0|6.0|2.5|6.5)
+        which fvwm2 >/dev/null 2>&1 && \
+        ( echo "EdgeScroll 0 0" > ${redodir}/fvwm
+        fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 & )
+      ;;
+    esac
+  fi
   ${VIRTCMD} ${VIRTCMDOPTS}
   writelog "Bye.\n"
   exit 0
diff --git a/os-plugins/plugins/vmchooser/files/vm-template.xml b/os-plugins/plugins/vmchooser/files/vm-template.xml
new file mode 100755
index 00000000..ce4eb343
--- /dev/null
+++ b/os-plugins/plugins/vmchooser/files/vm-template.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<settings>
+  <entry>
+    <!-- VM-name with ending .vmdk, .img, .vdi, .qcow2 -->
+    <image_name param="vm-image.vmdk">
+    </image_name>
+    <creator param="Your Name">
+    </creator>
+    <email param="your@email.address.tld">
+    </email>
+    <phone param="-">
+    </phone> 
+    <!-- sort after parameters then alphabet, values 0(top) - 9(bottom) -->
+    <priority param="5">
+    </priority>
+    <!-- title shown in the menu -->
+    <title param="My VM Image">
+    </title>
+    <!-- description shown when image is chosen -->
+    <description>Image for lectures with a lot of software: office, ...
+    </description>
+    <!-- type of the OS: if you do not know use "other" -->
+    <!-- vmware refer to: http://sanbarrow.com/vmx/vmx-guestos.html -->
+    <os param="winxppro">
+    </os>
+    <!-- "nat", "bridge", "hostonly" -->
+    <network param="nat">
+    </network>
+    <!-- "vmware", "virtualbox", "qemu" -->
+    <virtualmachine param="vmware">
+    </virtualmachine>
+    <!-- when should this image be deactivated automatically -->
+    <valid_until param="DD-MM-YY">
+    </valid_until>
+    <!-- if active="true" the image is selectable via vmchooser -->
+    <active param="true">
+    </active>
+    <!-- in which environment this image will be selectable via vmchooser -->
+    <environment param="default">
+    </environment>
+    <!-- obsolete, maybe for future implementations
+      <xdm param="false">
+      </xdm>
+    -->
+    <!-- vmchooser stuff, automatically added
+      <!-- added automatically through vmchooser when started -- >
+      <username param="user-id">
+      </username>
+      <!-- which printers should be connected -- >
+      <printers>
+      <printer name="" path="">Human readable description</printer>
+      </printers>
+      <!-- which scanners should be connected -- >
+      <scanners>
+      <scanner name="" path="">Description</scanner>
+      </scanners>
+    -->
+    <!-- should the home-directory be connected -->
+    <home param="true">
+    </home>
+    <!-- which shared folders should be connected -->
+    <shared_folders param="true">
+    <shared_folder name="" path="" pass=""></shared_folder>
+    </shared_folders>
+    <!-- there is the ability to protect an image for a while using a -->
+    <!-- password. Helpfull for courses (with special software licences). -->
+    <locked param="true">
+    </locked>
+  </entry>
+</settings>
-- 
cgit v1.2.3-55-g7522