From 302f6e1560f6b3d83e011575345892d9b59924cf Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Jun 2023 14:46:08 +0200
Subject: [remote-access] Look for proper port(s) when checking activity

---
 core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver | 2 +-
 1 file changed, 1 insertion(+), 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 534e3c69..2a5ced0f 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
@@ -94,7 +94,7 @@
 	iptables -t nat -D PREROUTING -p tcp --dport "$vnc_port" -j REDIRECT --to-ports 5901
 	while [ -d "/proc/${vncpid}" ]; do
 		sleep 5
-		if netstat -tn | awk 'BEGIN{ e=1 } { if ($4 ~ /:590[0123]$/) e=0 } END{ exit e }'; then
+		if netstat -tn | awk 'BEGIN{ e=1 } { if ($4 ~ /:('$vnc_port'|5901)$/) e=0 } END{ exit e }'; then
 			gotone=true
 			idle=0
 		else
-- 
cgit v1.2.3-55-g7522