ac19e038b4
The aim here is to improve the user experience. There's anecdotal evidence that the network performance for bordeaux is better compared to ci at least for some users, and I don't know of any issues with rate limiting or access restriction for bordeaux compared to ci. It also has IPv6 support. Additionally, bordeaux generally had more substitutes than ci, particularly for aarch64-linux and armhf-linux. This change will offer a very slight speedup for those substitutes that only bordeaux has. Bordeaux has been a default substitute server for nearly 3 years now and I think this change is overdue. I'm also hopeful that we'll be able to build on the testing regarding mirrors for bordeaux, and that'll allow potentially improving the hosting setup (through providing more redundancy) and further improving substitute fetching for users who currently have issues with substitute access. * config-daemon.ac: Switch substitute urls order. * doc/guix.texi: Ditto. * etc/guix-install.sh: Ditto. * gnu/installer/newt/network.scm (wait-service-online): Ditto. * guix/store.scm (%default-substitute-urls): Ditto. Change-Id: I4f6d93ae1fc8b03d80b47b18b5749a51f1fde17b Signed-off-by: Christopher Baines <mail@cbaines.net>
199 lines
6.9 KiB
Scheme
199 lines
6.9 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
|
|
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
|
;;;
|
|
;;; This file is part of GNU Guix.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (gnu installer newt network)
|
|
#:use-module (gnu installer connman)
|
|
#:use-module (gnu installer steps)
|
|
#:use-module (gnu installer utils)
|
|
#:use-module (gnu installer newt ethernet)
|
|
#:use-module (gnu installer newt page)
|
|
#:use-module (gnu installer newt wifi)
|
|
#:use-module (guix i18n)
|
|
#:use-module (srfi srfi-1)
|
|
#:use-module (srfi srfi-11)
|
|
#:use-module (srfi srfi-34)
|
|
#:use-module (srfi srfi-35)
|
|
#:use-module (ice-9 match)
|
|
#:use-module (web client)
|
|
#:use-module (web response)
|
|
#:use-module (newt)
|
|
#:export (run-network-page))
|
|
|
|
;; Maximum length of a technology name.
|
|
(define technology-name-max-length (make-parameter 20))
|
|
|
|
(define (technology->text technology)
|
|
"Return a string describing the given TECHNOLOGY."
|
|
(let* ((name (technology-name technology))
|
|
(padded-name (string-pad-right name
|
|
(technology-name-max-length))))
|
|
(format #f "~a~%" padded-name)))
|
|
|
|
(define (run-technology-page)
|
|
"Run a page to ask the user which technology shall be used to access
|
|
Internet and return the selected technology. For now, only technologies with
|
|
\"ethernet\" or \"wifi\" types are supported."
|
|
(define (technology-items)
|
|
(filter (lambda (technology)
|
|
(let ((type (technology-type technology)))
|
|
(or
|
|
(string=? type "ethernet")
|
|
(string=? type "wifi"))))
|
|
(connman-technologies)))
|
|
|
|
(match (technology-items)
|
|
(()
|
|
(case (choice-window
|
|
(G_ "Internet access")
|
|
(G_ "Continue")
|
|
(G_ "Exit")
|
|
(G_ "The install process requires Internet access but no \
|
|
network devices were found. Do you want to continue anyway?"))
|
|
((1) (abort-to-prompt 'installer-step 'break))
|
|
((2) (abort-to-prompt 'installer-step 'abort))))
|
|
((technology)
|
|
;; Since there's only one technology available, skip the selection
|
|
;; screen.
|
|
technology)
|
|
((items ...)
|
|
(run-listbox-selection-page
|
|
#:info-text (G_ "The install process requires Internet access.\
|
|
Please select a network device.")
|
|
#:title (G_ "Internet access")
|
|
#:listbox-items items
|
|
#:listbox-item->text technology->text
|
|
#:listbox-height (min (+ (length items) 2) 5)
|
|
#:button-text (G_ "Exit")
|
|
#:button-callback-procedure
|
|
(lambda _
|
|
(abort-to-prompt 'installer-step 'abort))))))
|
|
|
|
(define (find-technology-by-type technologies type)
|
|
"Find and return a technology with the given TYPE in TECHNOLOGIES list."
|
|
(find (lambda (technology)
|
|
(string=? (technology-type technology)
|
|
type))
|
|
technologies))
|
|
|
|
(define (wait-technology-powered technology)
|
|
"Wait and display a progress bar until the given TECHNOLOGY is powered."
|
|
(let ((name (technology-name technology))
|
|
(full-value 5))
|
|
(run-scale-page
|
|
#:title (G_ "Powering technology")
|
|
#:info-text (format #f (G_ "Waiting for technology ~a to be powered.")
|
|
name)
|
|
#:scale-full-value full-value
|
|
#:scale-update-proc
|
|
(lambda (value)
|
|
(let* ((technologies (connman-technologies))
|
|
(type (technology-type technology))
|
|
(updated-technology
|
|
(find-technology-by-type technologies type))
|
|
(technology-powered? updated-technology))
|
|
(sleep 1)
|
|
(if technology-powered?
|
|
full-value
|
|
(+ value 1)))))))
|
|
|
|
(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
|
|
(= (response-code (http-request url))
|
|
200)))
|
|
|
|
(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?)
|
|
(ci-available?))
|
|
(file-exists? "/tmp/installer-assume-online")))
|
|
|
|
(let* ((full-value 5))
|
|
(run-scale-page
|
|
#:title (G_ "Checking connectivity")
|
|
#:info-text (G_ "Waiting for Internet access establishment...")
|
|
#:scale-full-value full-value
|
|
#:scale-update-proc
|
|
(lambda (value)
|
|
(sleep 1)
|
|
(if (online?)
|
|
full-value
|
|
(+ value 1))))
|
|
(unless (online?)
|
|
(run-error-page
|
|
(G_ "The selected network does not provide access to the \
|
|
Internet and the Guix substitute server, please try again.")
|
|
(G_ "Connection error"))
|
|
(abort-to-prompt 'installer-step 'abort))))
|
|
|
|
(define (run-network-page)
|
|
"Run a page to allow the user to configure connman so that it can access the
|
|
Internet."
|
|
(define network-steps
|
|
(list
|
|
;; Ask the user to choose between ethernet and wifi technologies.
|
|
(installer-step
|
|
(id 'select-technology)
|
|
(compute
|
|
(lambda _
|
|
(run-technology-page))))
|
|
;; Enable the previously selected technology.
|
|
(installer-step
|
|
(id 'power-technology)
|
|
(compute
|
|
(lambda (result _)
|
|
(let ((technology (result-step result 'select-technology)))
|
|
(connman-enable-technology technology)
|
|
(wait-technology-powered technology)))))
|
|
;; Propose the user to connect to one of the service available for the
|
|
;; previously selected technology.
|
|
(installer-step
|
|
(id 'connect-service)
|
|
(compute
|
|
(lambda (result _)
|
|
(let* ((technology (result-step result 'select-technology))
|
|
(type (technology-type technology)))
|
|
(cond
|
|
((string=? "wifi" type)
|
|
(run-wifi-page))
|
|
((string=? "ethernet" type)
|
|
(run-ethernet-page)))))))
|
|
;; Wait for connman status to switch to 'online, which means it can
|
|
;; access Internet.
|
|
(installer-step
|
|
(id 'wait-online)
|
|
(compute (lambda _
|
|
(wait-service-online))))))
|
|
(run-installer-steps
|
|
#:steps network-steps
|
|
#:rewind-strategy 'start))
|