diff options
| author | Simon Rettberg | 2017-03-17 20:30:40 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-03-17 20:30:40 +0100 |
| commit | feb18599c24e15d387d1da5b876fb749d02b9f71 (patch) | |
| tree | 9f5a149568e40129e5dde3b4e7d4b53ec86a9fc7 /core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes | |
| parent | [run-virt] Fix whitespace errors (diff) | |
| download | mltk-feb18599c24e15d387d1da5b876fb749d02b9f71.tar.gz mltk-feb18599c24e15d387d1da5b876fb749d02b9f71.tar.xz mltk-feb18599c24e15d387d1da5b876fb749d02b9f71.zip | |
[run-virt] Check SLX_ variables for empty, not isset
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes')
2 files changed, 2 insertions, 2 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 9b2fb574..071da751 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 @@ -12,7 +12,7 @@ download_metadata() { EXIT_TYPE="internal" EXIT_REASON="Fehlendes Dienstprogramm 'wget'!" cleanexit 1 fi - if ! isset SLX_VMCHOOSER_BASE_URL; then + if isempty SLX_VMCHOOSER_BASE_URL; then writelog "SLX_VMCHOOSER_BASE_URL is not set! Was /opt/openslx/config sourced?" EXIT_TYPE="internal" EXIT_REASON="Keine URL zur Schnittstelle des bwLehrpool-Satelliten gefunden!" cleanexit 1 fi diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc index 311461f1..0d613c54 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc @@ -97,7 +97,7 @@ setup_image_access() { writelog "\tCan't use dnbd3 as dnbd3-fuse/fusermount binaries are not in PATH" elif ! isset SRC_IMG_RELATIVE; then writelog "\tCan't use dnbd3 as SRC_IMG_RELATIVE is not set" - elif ! isset SLX_DNBD3_SERVERS || [ "x${SLX_VM_DNBD3}" != "xyes" ]; then + elif isempty SLX_DNBD3_SERVERS || [ "x${SLX_VM_DNBD3}" != "xyes" ]; then writelog "\tCan't use dnbd3 as no servers are given in config, or SLX_VM_DNBD3 is not set to yes" else # register setup_dnbd3 as start hook after sourcing this include |