From 77c00b1e573776643a4cfb81415be52f436d3ef3 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Wed, 5 Dec 2018 21:58:26 +0900
Subject: 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(-)

(limited to 'gnu/installer')

diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index ee6af0674e..64fab2ae9f 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -53,18 +53,32 @@ (define (technology-items)
                  (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."
-- 
cgit v1.2.3