From 2ec482308d1a1dcabbcf4b8053c48d4bf4c0a44b Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 11 Oct 2013 13:18:28 +0200
Subject: [vmchooser] added TODO to enable SCSI support for  virtual disks

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'remote/modules/vmchooser/data')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 10a6283d..ec860b3c 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -383,6 +383,7 @@ cdtest=${cdrom_1:+"TRUE"}
 cdrom1=${cdtest:-"FALSE"}
 # IDE is expected default, test for the virtual disk image type should
 # be done while creating the runscripts ...
+# TODO enable SCSI support instead of just disabling it.
 ide="TRUE"
 scsi="FALSE"
 hddrv="ide"
-- 
cgit v1.2.3-55-g7522


From effe3dfa20669f9d5c9bafa67d2b085d2f760a13 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 15 Oct 2013 15:53:28 +0200
Subject: [vmchooser/xmlfilter] filter out virtualbox images since vbox is not
 supported yet.

---
 .../vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'remote/modules/vmchooser/data')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
index 3e0ee42d..fad8c064 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
@@ -56,11 +56,12 @@ function handlePersistentVM() {
 
 for FILE in $(find -L "$1" -iname "*.xml"); do
   # filter all xmls which aren't set active
-  if [ $(grep "<active param=.*true.*" "$FILE" | wc -l) -eq 1 ]; then
+  grep -i -q "<active param=.*true.*" "$FILE" || continue
+  # HACK: filter all virtualbox images, as vbox is not ready yet
+  grep -i -q "<virtualmachine param=.*virtualbox.*" "$FILE" && continue
     if [ -n "${vmchooser_env}" ]; then
       # filter all xmls with pool-param not equal to vmchooser::env
-      if [ $(grep "<pools param=\"${vmchooser_env}\"" "$FILE" | wc -l) -eq 1 ]
-      then
+      if [ $(grep "<pools param=\"${vmchooser_env}\"" "$FILE" | wc -l) -eq 1 ]; then
         handlePersistentVM "$FILE"
         echo "$FILE"
       fi
@@ -69,5 +70,4 @@ for FILE in $(find -L "$1" -iname "*.xml"); do
       # if there is no pool set, just take all available xmls
       echo "$FILE"
     fi
-  fi
 done
-- 
cgit v1.2.3-55-g7522


From 9ca0ce06f0d7d9241edb219a0736c04091df8c04 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 15 Oct 2013 16:01:51 +0200
Subject: [vmchooser] Fix indentation of xml-filter

---
 .../data/opt/openslx/scripts/vmchooser-xml_filter  | 76 +++++++++++-----------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'remote/modules/vmchooser/data')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
index fad8c064..4faea740 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
@@ -30,44 +30,44 @@
 . /opt/openslx/config
 
 if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf ]; then
-  . ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf
+	. ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf
 fi
 
 function handlePersistentVM() {
-  if [[ "$(grep --extended-regexp \
-        "<persistent param=\"(|.+:)$USER(|:.+)\"" "$1")" ]]; then
-    # If this virtual machine is useable as persistent version for current
-    # user we provide an additional persistent version.
-    local imageName=$(basename "$(grep -io '<image_name param=.*"' "$1" | \
-        sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')") && \
-    eval export SLX_VM_PERSISTENT_PATH="${SLX_VM_PERSISTENT_PATH}" && \
-    local imagePath="${SLX_VM_PERSISTENT_PATH}${imageName}"
-    local persistentConfigVersionFilePath="$(mktemp --directory)/$(basename \
-        "$1")" && \
-    local vmchooserFilePath="$(dirname "$0")/vmchooser-clc" && \
-    if [ ! -f "$vmchooserFilePath" ]; then
-        vmchooserFilePath='/opt/openslx/plugin-repo/vmchooser/vmchooser-clc'
-    fi
-    bash "$vmchooserFilePath" "$1" "$persistentConfigVersionFilePath" \
-        --create-persistent-config "$imagePath" && \
-    echo "$persistentConfigVersionFilePath"
-  fi
-}
-
-for FILE in $(find -L "$1" -iname "*.xml"); do
-  # filter all xmls which aren't set active
-  grep -i -q "<active param=.*true.*" "$FILE" || continue
-  # HACK: filter all virtualbox images, as vbox is not ready yet
-  grep -i -q "<virtualmachine param=.*virtualbox.*" "$FILE" && continue
-    if [ -n "${vmchooser_env}" ]; then
-      # filter all xmls with pool-param not equal to vmchooser::env
-      if [ $(grep "<pools param=\"${vmchooser_env}\"" "$FILE" | wc -l) -eq 1 ]; then
-        handlePersistentVM "$FILE"
-        echo "$FILE"
-      fi
-    else
-      handlePersistentVM "$FILE"
-      # if there is no pool set, just take all available xmls
-      echo "$FILE"
-    fi
-done
+	if [[ "$(grep --extended-regexp \
+		"<persistent param=\"(|.+:)$USER(|:.+)\"" "$1")" ]]; then
+		# If this virtual machine is useable as persistent version for current
+		# user we provide an additional persistent version.
+		local imageName=$(basename "$(grep -io '<image_name param=.*"' "$1" | \
+			sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')") && \
+			eval export SLX_VM_PERSISTENT_PATH="${SLX_VM_PERSISTENT_PATH}" && \
+			local imagePath="${SLX_VM_PERSISTENT_PATH}${imageName}"
+			local persistentConfigVersionFilePath="$(mktemp --directory)/$(basename \
+			"$1")" && \
+			local vmchooserFilePath="$(dirname "$0")/vmchooser-clc" && \
+			if [ ! -f "$vmchooserFilePath" ]; then
+				vmchooserFilePath='/opt/openslx/plugin-repo/vmchooser/vmchooser-clc'
+			fi
+			bash "$vmchooserFilePath" "$1" "$persistentConfigVersionFilePath" \
+			--create-persistent-config "$imagePath" && \
+			echo "$persistentConfigVersionFilePath"
+		fi
+	}
+	
+	for FILE in $(find -L "$1" -iname "*.xml"); do
+		# filter all xmls which aren't set active
+		grep -i -q "<active param=.*true.*" "$FILE" || continue
+		# HACK: filter all virtualbox images, as vbox is not ready yet
+		grep -i -q "<virtualmachine param=.*virtualbox.*" "$FILE" && continue
+		if [ -n "${vmchooser_env}" ]; then
+			# filter all xmls with pool-param not equal to vmchooser::env
+			if [ $(grep "<pools param=\"${vmchooser_env}\"" "$FILE" | wc -l) -eq 1 ]; then
+				handlePersistentVM "$FILE"
+				echo "$FILE"
+			fi
+		else
+			handlePersistentVM "$FILE"
+			# if there is no pool set, just take all available xmls
+			echo "$FILE"
+		fi
+	done
-- 
cgit v1.2.3-55-g7522