[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/80: installer: Fix incorrect host in ping task.
From: |
John Darrington |
Subject: |
23/80: installer: Fix incorrect host in ping task. |
Date: |
Tue, 3 Jan 2017 15:49:42 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit b574581df42fe46619908f991ccba15fd0ae52d3
Author: John Darrington <address@hidden>
Date: Fri Dec 23 20:45:23 2016 +0100
installer: Fix incorrect host in ping task.
* gnu/system/installer/ping.scm (ping-page-key-handler): Use host part of
uri
only. Commit cd6fd079e61c07135902b673991164ba705c037c inadvertently
introduced
this bug.
---
gnu/system/installer/ping.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/system/installer/ping.scm b/gnu/system/installer/ping.scm
index fb00292..2adee6f 100644
--- a/gnu/system/installer/ping.scm
+++ b/gnu/system/installer/ping.scm
@@ -24,7 +24,7 @@
#:use-module (guix store)
#:use-module (gurses buttons)
#:use-module (ncurses curses)
-
+ #:use-module (web uri)
#:export (ping-page-refresh)
#:export (ping-page-key-handler))
@@ -45,10 +45,10 @@
(cond
((eqv? (buttons-selected nav) (1- (buttons-n-buttons nav)))
(buttons-unselect-all nav))
-
+
(else
(buttons-select-next nav))))
-
+
((eq? ch KEY_LEFT)
(buttons-select-prev nav))
@@ -62,17 +62,20 @@
(delwin (page-datum page 'test-window))
(set! page-stack (cdr page-stack))
)
-
- ((buttons-key-matches-symbol? nav ch 'test)
- (let* ();;(windowp (make-window-port test-window)))
+ ((buttons-key-matches-symbol? nav ch 'test)
+ (let* ()
(if (zero?
- (window-pipe test-window "ping" "ping" "-c" "3" (car
%default-substitute-urls)))
+ (window-pipe test-window "ping" "ping" "-c" "3"
+ (uri-host
+ (string->uri
+ (car %default-substitute-urls)))))
+
(addstr test-window
(gettext "Test successful. Network is working."))
(addstr test-window
(gettext "Test failed. No servers reached.")))
-
+
(refresh test-window)))) #f))
(define (ping-page-refresh page)
@@ -113,6 +116,3 @@
(buttons-post buttons button-window)
(refresh text-window)
(refresh button-window)))
-
-
-
- 05/80: installer: fix warning in usage of "format"., (continued)
- 05/80: installer: fix warning in usage of "format"., John Darrington, 2017/01/03
- 03/80: installer: Remove obsolete procedures/variables, John Darrington, 2017/01/03
- 02/80: installer: Fix broken keymap change option., John Darrington, 2017/01/03
- 07/80: installer: Use ice-9 match., John Darrington, 2017/01/03
- 06/80: installer: use ice-9 format everywhere., John Darrington, 2017/01/03
- 08/80: installer: Add IETF contraints for hostname in entry form., John Darrington, 2017/01/03
- 12/80: installer: Add gurses modules., John Darrington, 2017/01/03
- 21/80: gnu: guix: Add dependency: guile-ncurses., John Darrington, 2017/01/03
- 17/80: installer: Add new procedure to get the list of volumes., John Darrington, 2017/01/03
- 19/80: installer: Handle the 'back' action in the filesystems task., John Darrington, 2017/01/03
- 23/80: installer: Fix incorrect host in ping task.,
John Darrington <=
- 25/80: installer: Use a cleaner way of generating the lspci information., John Darrington, 2017/01/03
- 24/80: installer: Make "interfaces" return an alist., John Darrington, 2017/01/03
- 27/80: installer: Connect ethernet interfaces on selection., John Darrington, 2017/01/03
- 28/80: installer: Let the kernel know about (possibly) changed partitions., John Darrington, 2017/01/03
- 49/80: installer: Wrap installer in (catch #t ...), John Darrington, 2017/01/03
- 09/80: installer: Use a record instead of a list to contain tasks., John Darrington, 2017/01/03
- 29/80: installer: Deal with partition tables which are (partially) corrupt., John Darrington, 2017/01/03
- 37/80: installer: Improve dependencies on the final task., John Darrington, 2017/01/03
- 31/80: gnu: Add service to start the installer in installation-os., John Darrington, 2017/01/03
- 36/80: installer: Remove ad-hoc completed predicate and use standard one., John Darrington, 2017/01/03