[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
42/67: installer: network: Do not show an empty technology list.
From: |
guix-commits |
Subject: |
42/67: installer: network: Do not show an empty technology list. |
Date: |
Wed, 16 Jan 2019 19:00:42 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit b45f4b0fa3fe1e8de753147cddfb361fa1afe9d0
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."
- 66/67: installer: "formating" → "formatting"., (continued)
- 66/67: installer: "formating" → "formatting"., guix-commits, 2019/01/16
- 12/67: installer: Move everything to the build side., guix-commits, 2019/01/16
- 39/67: installer: Turn "Cancel" buttons into "Exit" buttons., guix-commits, 2019/01/16
- 23/67: installer: Do not ask for keyboard model., guix-commits, 2019/01/16
- 62/67: installer: partition: Add encryption password confirmation., guix-commits, 2019/01/16
- 60/67: installer: Remove debug popup., guix-commits, 2019/01/16
- 54/67: installer: parted: Use read-luks-partition-uuid instead of find-partition-by-luks-uuid., guix-commits, 2019/01/16
- 59/67: installer: welcome: Put "Graphical installer" ahead., guix-commits, 2019/01/16
- 55/67: installer: Various renamings., guix-commits, 2019/01/16
- 64/67: syscalls: 'device-in-use?' returns #f upon EINVAL., guix-commits, 2019/01/16
- 42/67: installer: network: Do not show an empty technology list.,
guix-commits <=
- 41/67: installer: keymap: Fix keymap selection of layouts with not variant., guix-commits, 2019/01/16
- 58/67: installer: Rename "Ok" buttons to "OK"., guix-commits, 2019/01/16
- 67/67: installer: Fix manual partitioning., guix-commits, 2019/01/16
- 61/67: installer: keymap: Put English layout and international variant ahead., guix-commits, 2019/01/16
- 56/67: installer: Various renamins follow-up., guix-commits, 2019/01/16
- 63/67: syscalls: 'device-in-use?' does not create a port., guix-commits, 2019/01/16
- 31/67: installer: Add partitioning support., guix-commits, 2019/01/16
- 51/67: installer: partionment: Add encryption support., guix-commits, 2019/01/16
- 04/67: gnu: Add graphical installer support., guix-commits, 2019/01/16