From 8a927da541ff175c2601e54726c642b0d5375b13 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 14 Jul 2016 15:07:30 +0200
Subject: Update several calls to slxlog with --delete instead of having sleep
 + rm follow the call

---
 .../data/opt/openslx/scripts/includes/setup_image_access.inc         | 2 --
 .../modules/run-virt/data/opt/openslx/scripts/systemd-mount_vm_store | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'remote/modules/run-virt/data')

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
 
-- 
cgit v1.2.3-55-g7522