diff options
| author | Simon Rettberg | 2017-12-01 18:52:03 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-01 18:52:03 +0100 |
| commit | d7c03e507fe74166eb595e378d0d4b1f68bbcef0 (patch) | |
| tree | ea813ae1f13a2e067dfdd4ed7ef1567aafb21eb1 /core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc | |
| parent | [run-virt] sanitize downloaded maschine desc (diff) | |
| download | mltk-d7c03e507fe74166eb595e378d0d4b1f68bbcef0.tar.gz mltk-d7c03e507fe74166eb595e378d0d4b1f68bbcef0.tar.xz mltk-d7c03e507fe74166eb595e378d0d4b1f68bbcef0.zip | |
Revert "[run-virt] sanitize downloaded maschine desc"
This is VMX specific, needs to be done in vmware plugin,
not global run-virt. Reverting because weekend.
This reverts commit ae681fa769d3204c14ba2dfda817cd721b45060c.
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc index 20d5fac9..807c2840 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc @@ -32,14 +32,6 @@ download_metadata() { writelog "Downloaded VM description from '${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}' successfully." if [ -s "$TMPCONFIG" ]; then # Downloaded a non-zero VM description file, all good - # sanitize what we got to make sure, we don't have a bad starting - # point - local TMPTMPCONFIG="$(mktemp)" - grep -E '^\s*(#|[^=]+=[^"]*"[^"]*"\s*$|[^=]+=[^"]+$|$)' "$TMPCONFIG" > "$TMPTMPCONFIG" - if ! diff -q "$TMPCONFIG" "$TMPTMPCONFIG"; then - writelog "'$TMPCONFIG' was pruned by the post-download sanitizer!" - fi - mv "$TMPTMPCONFIG" "$TMPCONFIG" return 0 else writelog "Server sent zero byte virtual machine description file." |