aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2019-05-29 09:44:44 +0200
committerMathieu Othacehe <m.othacehe@gmail.com>2019-05-29 11:44:49 +0200
commit694cb8dc62f59fb67799ad4908a6b12cf7cb49a3 (patch)
tree5407e94dc7626cdd43b5e8d66aaeda78902dcc4f
parent4b92dac20fbca636201a38916d65bf825d69cd7f (diff)
downloadpatches-694cb8dc62f59fb67799ad4908a6b12cf7cb49a3.tar
patches-694cb8dc62f59fb67799ad4908a6b12cf7cb49a3.tar.gz
installer: Fix wifi menu crash with hidden SSIDs.
This fixes https://issues.guix.gnu.org/issue/35622. * gnu/installer/connman.scm (<service>): Mention that name may be false. * gnu/installer/newt/wifi.scm (wifi-services): Filter out wifi services without name. Co-authored by: Pierre Neidhardt <mail@ambrevar.xyz>
-rw-r--r--gnu/installer/connman.scm2
-rw-r--r--gnu/installer/newt/wifi.scm1
2 files changed, 2 insertions, 1 deletions
diff --git a/gnu/installer/connman.scm b/gnu/installer/connman.scm
index ef8cca3952..7f47b9af77 100644
--- a/gnu/installer/connman.scm
+++ b/gnu/installer/connman.scm
@@ -108,7 +108,7 @@
(define-record-type* <service>
service make-service
service?
- (name service-name) ; string
+ (name service-name) ; string or #f
(type service-type) ; string
(path service-path) ; string
(strength service-strength) ; integer
diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm
index da2f0b56d0..1cb2ef2df3 100644
--- a/gnu/installer/newt/wifi.scm
+++ b/gnu/installer/newt/wifi.scm
@@ -144,6 +144,7 @@ of <service-item> records present in LISTBOX."
(let ((services (connman-services)))
(filter (lambda (service)
(and (string=? (service-type service) "wifi")
+ (service-name service)
(not (string-null? (service-name service)))))
services)))