diff options
| author | Jonathan Bauer | 2016-07-15 13:33:31 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-07-15 13:33:31 +0200 |
| commit | e95317dc5caf6907f1b8d8a900320480dc3ab17e (patch) | |
| tree | 3e865f54c5a34724bd1a79fd8b1d062c48f5999d /remote/modules/run-virt | |
| parent | [dnbd3] fix missing dependency on fusermount for dnbd3-fuse (diff) | |
| parent | Update several calls to slxlog with --delete instead of having sleep + rm fol... (diff) | |
| download | tm-scripts-e95317dc5caf6907f1b8d8a900320480dc3ab17e.tar.gz tm-scripts-e95317dc5caf6907f1b8d8a900320480dc3ab17e.tar.xz tm-scripts-e95317dc5caf6907f1b8d8a900320480dc3ab17e.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/run-virt')
| -rw-r--r-- | remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc | 2 | ||||
| -rwxr-xr-x | remote/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc index 337562dc..3c4ed330 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc @@ -29,8 +29,6 @@ else writelog "dnbd3-fuse stopped working (Exit code $RET)" slxlog "virt-dnbd3-fuse" "dnbd3-fuse stopped/refused serving '${imgrelpath}' from '${SLX_DNBD3_SERVERS}' with error code: $RET" "${dnbd3_tmplog}" fi - sleep 2 - rm -f -- "$dnbd3_tmplog" "$dnbd3_exitflag" ) & # give it a bit of time usleep 250000 diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store b/remote/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store index 363e5253..235cf4be 100755 --- a/remote/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store +++ b/remote/modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store @@ -31,13 +31,12 @@ fi > "$OUTFILE" 2>&1 if [ "$RET" -ne "0" ]; then if [ -s "$OUTFILE" ]; then - slxlog "mount-vmstore-fail" "Mounting '$SLX_VM_NFS' failed. VMs will not boot." "$OUTFILE" - sleep 1 + slxlog --delete "mount-vmstore-fail" "Mounting '$SLX_VM_NFS' failed. VMs will not boot." "$OUTFILE" else slxlog "mount-vmstore-fail" "Mounting '$SLX_VM_NFS' failed. VMs will not boot." + rm -f -- "$OUTFILE" fi fi -rm -f -- "$OUTFILE" exit $RET |