diff options
| author | Simon Rettberg | 2023-02-15 11:50:16 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-02-15 11:50:16 +0100 |
| commit | df8870cc20afdeed1fe472fe8fa433c113f8e1bf (patch) | |
| tree | 0d8577fd1524e235f6cd7088f5c57462a7991851 /core/modules/remote-access | |
| parent | [run-virt] Don't slxlog, include curl log in main log instead, increase timeout (diff) | |
| download | mltk-df8870cc20afdeed1fe472fe8fa433c113f8e1bf.tar.gz mltk-df8870cc20afdeed1fe472fe8fa433c113f8e1bf.tar.xz mltk-df8870cc20afdeed1fe472fe8fa433c113f8e1bf.zip | |
[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.
Diffstat (limited to 'core/modules/remote-access')
| -rwxr-xr-x | core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver | 5 |
1 files changed, 4 insertions, 1 deletions
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" \ |