diff options
| author | Simon Rettberg | 2016-10-24 14:01:03 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-10-24 14:01:03 +0200 |
| commit | c274a008fd2a67388db1064a1ae1753018ef30d0 (patch) | |
| tree | 2d183d4417d1e38326011ec8e35b07d5e0231342 | |
| parent | [run-virt/...] More cleanup, refactoring, comments (diff) | |
| download | tm-scripts-c274a008fd2a67388db1064a1ae1753018ef30d0.tar.gz tm-scripts-c274a008fd2a67388db1064a1ae1753018ef30d0.tar.xz tm-scripts-c274a008fd2a67388db1064a1ae1753018ef30d0.zip | |
[run-virt] Fix misspelled variable, extract UUID from xml again
4 files changed, 7 insertions, 6 deletions
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc index b1995d09..974a5626 100644 --- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc +++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc @@ -9,8 +9,6 @@ writelog "Detecting current/legacy mode ..." declare -rg TMPCONFIG="$TMPDIR/vmconfig.tmp" -writelog "IMGUUID extracted: $IMGUUID" - # Assume legacy mode by default, only trigger "current" mode if everything else below worked LEGACY=yes if [ -z "$IMGUUID" ]; then # Keine uuid: Abbruch, Legacy diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc index eb699ec0..d40d97bb 100644 --- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc +++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc @@ -13,6 +13,8 @@ get_xml () { | sed 's/&/+/g;s/"/"/g;s/</</g;s/>/>/g' } +IMGUUID=$(get_xml "uuid") + # # Name of the virt image SRC_IMG_ABSOLUTE=$(get_xml "image_path") SRC_IMG_RELATIVE=$(get_xml "image_name") @@ -48,12 +50,14 @@ PLUGIN_ID=$(grep -o 'virtualmachine param=.*"' "${xmlfile}" \ # it will yield the default entries later on. VM_OS_TYPE=$(get_xml "os") +readonly IMGUUID readonly SRC_IMG_ABSOLUTE SRC_IMG_RELATIVE readonly IMG_BASENAME readonly VM_DISPLAYNAME VM_NAME_CLEAN readonly PLUGIN_ID readonly VM_OS_TYPE +writelog "VM UUID: $IMGUUID" writelog "Virtualization plugin: $PLUGIN_ID" writelog "VM name: $VM_DISPLAYNAME" writelog "VM short name: $VM_NAME_CLEAN" diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc index 4eb66028..4240d9ca 100644 --- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc +++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc @@ -76,10 +76,10 @@ if [ -z "$VM_DISKFILE_RO" ]; then rid_suffix=$(ls -1 "${SRC_IMG_ABSOLUTE}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+$' | sort -n | tail -n 1) if [ -n "$rid_suffix" ]; then # found - VM_DISKFILE_RO="${SRC_IMAGE_ABSOLUTE}.r${rid_suffix}" - elif [ -e "$SRC_IMAGE_ABSOLUTE" ]; then + VM_DISKFILE_RO="${SRC_IMG_ABSOLUTE}.r${rid_suffix}" + elif [ -e "$SRC_IMG_ABSOLUTE" ]; then # try name we got from xml in the first place - VM_DISKFILE_RO="$SRC_IMAGE_ABSOLUTE" + VM_DISKFILE_RO="$SRC_IMG_ABSOLUTE" fi fi diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc index e6776882..41986b2a 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc @@ -26,7 +26,6 @@ writelog "\tMem:\t\t${mem} MB" # echo nur wenn hostmem gesetzt [ -n "${hostmem}" ] && writelog "\tHostmem:\t${hostmem} MB" -writelog "\tMax. res.:\t${xres}x${yres}" writelog "\tCD-ROM1:\t${cdrom0}" writelog "\tCD-ROM2:\t${cdrom1}" writelog "\tFloppy_A:\t${floppy0}" |