From c36705229397f1fe60b3aacdd07790730e565906 Mon Sep 17 00:00:00 2001
From: Christoph Ostarek <christoph@zededa.com>
Date: Mon, 24 Jun 2024 17:59:10 +0200
Subject: [PATCH] replace serial console port 7777 as that one is used by gh
 action runner

---
 pkg/defaults/defaults.go              | 2 +-
 shell-scripts/collect-info-console.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go
index 2fd1bd85c..7c474514a 100644
--- a/pkg/defaults/defaults.go
+++ b/pkg/defaults/defaults.go
@@ -42,7 +42,7 @@ const (
 	DefaultIP                   = "192.168.0.1"
 	DefaultEVEIP                = "192.168.1.2"
 	DefaultEserverPort          = 8888
-	DefaultTelnetPort           = 7777
+	DefaultTelnetPort           = 17777
 	DefaultQemuMonitorPort      = 7788
 	DefaultQemuNetdevSocketPort = 7790
 	DefaultSSHPort              = 2222
diff --git a/shell-scripts/collect-info-console.sh b/shell-scripts/collect-info-console.sh
index 8e8308d46..0c6e47b43 100755
--- a/shell-scripts/collect-info-console.sh
+++ b/shell-scripts/collect-info-console.sh
@@ -18,7 +18,7 @@ for i in $(seq 3); do
   {
     echo "eve verbose off"; echo "eve enter debug"; sleep 3;
     echo "which collect-info.sh"; sleep 3
-  } | telnet localhost 7777 | tee telnet.stdout
+  } | telnet localhost 17777 | tee telnet.stdout
   grep -q "/usr/bin/collect-info.sh" telnet.stdout && break
   sleep 60
 done
@@ -27,7 +27,7 @@ for i in $(seq 3); do
   {
     echo "rm -f /persist/eve-info*"; echo "/usr/bin/collect-info.sh";
     sleep $((WAIT_TIME+60*(i-1)))
-  } | telnet localhost 7777 | tee telnet.stdout
+  } | telnet localhost 17777 | tee telnet.stdout
   TGZNAME="$(sed -n "s/EVE info is collected '\(.*\)'/\1/p" telnet.stdout)"
   [ -n "${TGZNAME}" ] && break
 done
@@ -44,7 +44,7 @@ for i in $(seq 3); do
     # This is fairly quick even on Github runners - around 10 seconds, but depends
     # on the tarball size.
     sleep $((20+60*(i-1)))
-  } | telnet localhost 7777 | sed -n "s/>>>\(.*\)<<</\1/p" | base64 -id > "${OUTPUT}"
+  } | telnet localhost 17777 | sed -n "s/>>>\(.*\)<<</\1/p" | base64 -id > "${OUTPUT}"
   [ -s "${OUTPUT}" ] && break
   echo "Failed to receive eve-info tarball, retrying..."
 done
@@ -55,4 +55,4 @@ if [ ! -s "${OUTPUT}" ]; then
 fi
 
 FILESIZE="$(stat -c%s "$OUTPUT")"
-echo "Received ${OUTPUT} with size ${FILESIZE}"
\ No newline at end of file
+echo "Received ${OUTPUT} with size ${FILESIZE}"