guix_mirror_bot pushed a commit to branch wip-fix-system-tests in repository guix.
commit 28b947938a1ca676acdb8f753063350f5ea69df0 Author: Mathieu Othacehe <[email protected]> AuthorDate: Sat Oct 18 16:18:31 2025 +0200 Revert "installer: wait-service-online: More urls to check user is online." This reverts commit 55584781e939d62d87b3f46350a359673b181691. --- gnu/installer/newt/network.scm | 43 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index 0b91bda5f8..8a2ad84e0d 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -112,35 +112,30 @@ network devices were found. Do you want to continue anyway?")) full-value (+ value 1))))))) -(define (url-alive? url) - (false-if-exception - (begin - (http-request url) - #t))) - -(define (common-urls-alive? urls) - (dynamic-wind - (lambda () - (sigaction SIGALRM - (lambda _ #f)) - (alarm 3)) - (lambda () - (any url-alive? - urls)) - (lambda () - (alarm 0)))) - (define (wait-service-online) "Display a newt scale until connman detects an Internet access. Do FULL-VALUE tentatives, spaced by 1 second." + (define (url-alive? url) + (false-if-exception + (begin + (http-request url) + #t))) + + (define (ci-available?) + (dynamic-wind + (lambda () + (sigaction SIGALRM + (lambda _ #f)) + (alarm 3)) + (lambda () + (or (url-alive? "https://bordeaux.guix.gnu.org";) + (url-alive? "https://ci.guix.gnu.org";))) + (lambda () + (alarm 0)))) + (define (online?) (or (and (connman-online?) - (common-urls-alive? - (list - "https://bordeaux.guix.gnu.org"; - "https://ci.guix.gnu.org"; - "https://guix.gnu.org"; - "https://gnu.org";))) + (ci-available?)) (file-exists? "/tmp/installer-assume-online"))) (let* ((full-value 5))
