From df8870cc20afdeed1fe472fe8fa433c113f8e1bf Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 15 Feb 2023 11:50:16 +0100
Subject: [remote-access/hardware-stats] Try harder to avoid races and keep
 order

Don't send usage updates or the VNC password before we haven't
successfully sent the ~poweron event.
---
 core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'core/modules/remote-access')

diff --git a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
index b6c9d395..bc4ab82c 100755
--- a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
+++ b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
@@ -60,7 +60,10 @@
 	# with the ~poweron event, which would reset the password in the database.
 	(
 		url="http://${SLX_PXE_SERVER_IP}/slx-admin/api.php?do=remoteaccess"
-		sleep 6
+		for _ in {1..20}; do
+			sleep 1
+			[ -e "/etc/cron.d/usage_stats" ] && break
+		done
 		[ -d "/proc/${vncpid}" ] || exit 1 # Something is wrong, bail
 		curl -s -S -L --retry 4 --retry-connrefused --max-time 3 --retry-max-time 10 \
 			--data-urlencode "password=$passwd" \
-- 
cgit v1.2.3-55-g7522