dannym pushed a commit to branch wip-installer-2
in repository guix.
commit cd3a276921064fa103a493a1b75c1b2e10722735
Author: John Darrington <[email protected]>
Date: Thu Dec 22 08:51:20 2016 +0100
installer: Use %default-subsitute-urls instead of our own variable.
* gnu/system/installer/network.scm: Use %default-substitute-servers.
* gnu/system/installer/ping.scm (subsitute-servers): Delete variable,
(ping-page-key-handler) Use %default-substitute-servers.
---
gnu/system/installer/network.scm | 3 ++-
gnu/system/installer/ping.scm | 8 +++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 0330164..ab8add3 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -26,6 +26,7 @@
#:use-module (gurses menu)
#:use-module (gurses buttons)
#:use-module (ncurses curses)
+ #:use-module (guix store)
#:export (make-network-page))
@@ -158,7 +159,7 @@
(addstr* text-window (format #f
(gettext
- "To install GuixSD a connection to ~a must be available. The
following network devices exist on the system. Select one to configure or
\"Continue\" to proceeed.") (car substitution-servers)))
+ "To install GuixSD a connection to one of ~s must be available.
The following network devices exist on the system. Select one to configure or
\"Continue\" to proceeed.") %default-substitute-urls))
(page-set-wwin! p pr)
(page-set-datum! p 'menu menu)
diff --git a/gnu/system/installer/ping.scm b/gnu/system/installer/ping.scm
index f7956e1..fb00292 100644
--- a/gnu/system/installer/ping.scm
+++ b/gnu/system/installer/ping.scm
@@ -21,16 +21,14 @@
#:use-module (gnu system installer page)
#:use-module (gnu system installer misc)
#:use-module (gnu system installer utils)
+ #:use-module (guix store)
#:use-module (gurses buttons)
#:use-module (ncurses curses)
- #:export (substitution-servers)
#:export (ping-page-refresh)
#:export (ping-page-key-handler))
-(define substitution-servers '("mirror.hydra.gnu.org"))
-
(define my-buttons `((test ,(N_ "_Test") #t)
(continue ,(N_ "_Continue") #t)
(back ,(N_ "Go _Back") #t)))
@@ -67,9 +65,9 @@
((buttons-key-matches-symbol? nav ch 'test)
- (let* ((windowp (make-window-port test-window)))
+ (let* ();;(windowp (make-window-port test-window)))
(if (zero?
- (window-pipe test-window "ping" "ping" "-c" "3" (car
substitution-servers)))
+ (window-pipe test-window "ping" "ping" "-c" "3" (car
%default-substitute-urls)))
(addstr test-window
(gettext "Test successful. Network is working."))
(addstr test-window
