diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-10 20:50:02 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-10 20:50:02 +0100 |
| commit | 50b99c90c87642f664f9c9523a6e40fc8542ddcf (patch) | |
| tree | 9fc8845e93ba913730e5fb92bbad158716d84e74 /gnu/installer/newt/network.scm | |
| parent | bda4b5e0453e4c8feda24306b4aa76ad5406eb7d (diff) | |
| parent | 21656ffa3b6d78a610f0befced20cc9b4b3baab6 (diff) | |
| download | guix-patches-50b99c90c87642f664f9c9523a6e40fc8542ddcf.tar guix-patches-50b99c90c87642f664f9c9523a6e40fc8542ddcf.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/installer/newt/network.scm')
| -rw-r--r-- | gnu/installer/newt/network.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index 40d85817b6..461d5d99c0 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> -;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -119,6 +119,10 @@ network devices were found. Do you want to continue anyway?")) (define (wait-service-online) "Display a newt scale until connman detects an Internet access. Do FULL-VALUE tentatives, spaced by 1 second." + (define (online?) + (or (connman-online?) + (file-exists? "/tmp/installer-assume-online"))) + (let* ((full-value 5)) (run-scale-page #:title (G_ "Checking connectivity") @@ -127,10 +131,10 @@ FULL-VALUE tentatives, spaced by 1 second." #:scale-update-proc (lambda (value) (sleep 1) - (if (connman-online?) + (if (online?) full-value (+ value 1)))) - (unless (connman-online?) + (unless (online?) (run-error-page (G_ "The selected network does not provide access to the \ Internet, please try again.") |