Double "Waiting for network connection" message

[DaniilKl]

Component

Dasharo Tools Suite

Device

other

Dasharo version

Dasharo Tools Suite version

2.2.0

Test case ID

No response

Brief summary

Sometimes network connection could be checked several times in a row.

How reproducible

100%

How to reproduce

Boot DTS and provide credentials. Note that providing credentials not the only place where such situation can occur.

Expected behavior

Network connection check should be properly handled.

Actual behavior

Screenshots

No response

Additional context

This patch might help:

diff --git a/include/dts-functions.sh b/include/dts-functions.sh
index 2f996d790cf4..6b396077bcbf 100644
--- a/include/dts-functions.sh
+++ b/include/dts-functions.sh
@@ -225,10 +225,6 @@ board_config() {
 # set. This is made with a goal to limit global variables declaration to
 # dts-environment.sh and board_config function.
 
-  # We download firmwares via network. At this point, the network connection
-  # must be up already.
-  wait_for_network_connection
-
   echo "Checking if board is Dasharo compatible."
   case "$SYSTEM_VENDOR" in
     "Notebook")
diff --git a/scripts/dasharo-deploy b/scripts/dasharo-deploy
index 29c51a3d254c..27b004e4063b 100644
--- a/scripts/dasharo-deploy
+++ b/scripts/dasharo-deploy
@@ -908,6 +908,9 @@ install_workflow() {
   # Set all global variables needed for installation:
   prepare_env install
 
+  # Check for network connection before downloading binaries:
+  wait_for_network_connection
+
   # Download and verify firmware:
   if [ "$HAVE_EC" == "true" ]; then
     download_ec
@@ -1017,6 +1020,9 @@ update_workflow() {
     fi
   fi
 
+  # Check for network connection before downloading binaries:
+  wait_for_network_connection
+
   if [ "$HAVE_EC" == "true" ]; then
     download_ec
     verify_artifacts ec
@@ -1163,6 +1169,9 @@ restore() {
         echo
         echo "Searching for HCL report on cloud..."
 
+        # Check for network connection before downloading HCL:
+        wait_for_network_connection
+
         ${CMD_CLOUD_LIST} $uuid
         error_check "Could not download HCL report from cloud."
 

Solutions you've tried

No response