summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcore/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver8
1 files changed, 7 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 f168d55a..36e91527 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
@@ -74,7 +74,13 @@
# Delay this a bit until x11vnc is ready, and since we might potentially have had a race
# with the ~poweron event, which would reset the password in the database.
(
- url="http://${SLX_PXE_SERVER_IP}/slx-admin/api.php?do=remoteaccess"
+ if [ -n "$SLX_REMOTE_LOG" ]; then
+ url="${SLX_REMOTE_LOG//=clientlog/=remoteaccess}"
+ elif [ -n "$SLX_PVS_CONFIG_URL" ]; then
+ url="${SLX_PVS_CONFIG_URL//=roomplanner/=remoteaccess}"
+ else
+ url="http://${SLX_PXE_SERVER_IP}/slx-admin/api.php?do=remoteaccess"
+ fi
for _ in {1..20}; do
sleep 1
[ -e "/etc/cron.d/usage_stats" ] && break