[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
43/68: installer: network: Do not show an empty technology list.
From: |
guix-commits |
Subject: |
43/68: installer: network: Do not show an empty technology list. |
Date: |
Thu, 17 Jan 2019 08:05:18 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 77c00b1e573776643a4cfb81415be52f436d3ef3
Author: Mathieu Othacehe <address@hidden>
Date: Wed Dec 5 21:58:26 2018 +0900
installer: network: Do not show an empty technology list.
If no technology is detected, ask the user if he prefers to continue or to
exit the installer.
* gnu/installer/newt/network.scm (run-technology-page): Run a choice-window
if
technology-items procedure returns an empty list.
---
gnu/installer/newt/network.scm | 38 ++++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 12 deletions(-)
diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index ee6af06..64fab2a 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -53,18 +53,32 @@ Internet and return the selected technology. For now, only
technologies with
(string=? type "wifi"))))
(connman-technologies)))
- (run-listbox-selection-page
- #:info-text (G_ "The install process requires an internet access.\
- Please select a network technology.")
- #:title (G_ "Internet access")
- #:listbox-items (technology-items)
- #:listbox-item->text technology->text
- #:button-text (G_ "Exit")
- #:button-callback-procedure
- (lambda _
- (raise
- (condition
- (&installer-step-abort))))))
+ (let ((items (technology-items)))
+ (if (null? items)
+ (case (choice-window
+ (G_ "Internet access")
+ (G_ "Continue")
+ (G_ "Exit")
+ (G_ "The install process requires an internet access, but no \
+network device were found. Do you want to continue anyway?"))
+ ((1) (raise
+ (condition
+ (&installer-step-break))))
+ ((2) (raise
+ (condition
+ (&installer-step-abort)))))
+ (run-listbox-selection-page
+ #:info-text (G_ "The install process requires an internet access.\
+ Please select a network device.")
+ #:title (G_ "Internet access")
+ #:listbox-items items
+ #:listbox-item->text technology->text
+ #:button-text (G_ "Exit")
+ #:button-callback-procedure
+ (lambda _
+ (raise
+ (condition
+ (&installer-step-abort))))))))
(define (find-technology-by-type technologies type)
"Find and return a technology with the given TYPE in TECHNOLOGIES list."
- 61/68: installer: Remove debug popup., (continued)
- 61/68: installer: Remove debug popup., guix-commits, 2019/01/17
- 56/68: installer: Various renamings., guix-commits, 2019/01/17
- 52/68: installer: partionment: Add encryption support., guix-commits, 2019/01/17
- 27/68: installer: Add new pages., guix-commits, 2019/01/17
- 57/68: installer: Various renamins follow-up., guix-commits, 2019/01/17
- 44/68: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/17
- 28/68: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/17
- 58/68: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/17
- 53/68: installer: Clear screen upon exit., guix-commits, 2019/01/17
- 49/68: installer: menu: Fix typo., guix-commits, 2019/01/17
- 43/68: installer: network: Do not show an empty technology list.,
guix-commits <=
- 50/68: installer: partition: Fix swaping and use syscalls., guix-commits, 2019/01/17
- 51/68: installer: partition: Fix typo., guix-commits, 2019/01/17
- 55/68: installer: parted: Use read-luks-partition-uuid instead of find-partition-by-luks-uuid., guix-commits, 2019/01/17
- 30/68: installer: Fix comments., guix-commits, 2019/01/17
- 59/68: installer: Rename "Ok" buttons to "OK"., guix-commits, 2019/01/17
- 47/68: installer: Display an eventual backtrace in a page., guix-commits, 2019/01/17
- 26/68: installer: Add hostname., guix-commits, 2019/01/17
- 10/68: guix: self: Do not install (gnu system install)., guix-commits, 2019/01/17
- 25/68: installer: Add services page., guix-commits, 2019/01/17
- 11/68: gnu: installer: Launch the installer as kmscon login-program., guix-commits, 2019/01/17