07/21: installer: No passphrase is needed for clear networks.

[John Darrington]

jmd pushed a commit to branch wip-installer
in repository guix.

commit ae0913f2f04d6a95408040db3123c37bdeb277c7
Author: John Darrington <address@hidden>
Date:   Tue Jan 24 11:08:32 2017 +0100

    installer: No passphrase is needed for clear networks.
    
    * gnu/system/installer/wireless.scm (wireless-page-key-handler): Don't
    prompt for a passphrase on networks which are not encrypted.
---
 gnu/system/installer/wireless.scm |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gnu/system/installer/wireless.scm 
b/gnu/system/installer/wireless.scm
index 5c47d22..96c35af 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -79,12 +79,20 @@
       (page-leave))
 
      ((select-key? ch)
-      (let ((next (make-passphrase-page
-                   page
-                   (M_ "Passphrase entry")
-                   (page-datum page 'ifce)
-                   (assq-ref (menu-get-current-item menu) 'essid))))
-        (page-enter next))))
+      (let ((ap (menu-get-current-item menu))
+            (ifce (page-datum page 'ifce)))
+        (if (assq-ref ap 'encryption)
+            (let ((next (make-passphrase-page
+                         page
+                         (M_ "Passphrase entry")
+                         ifce
+                         (assq-ref ap 'essid))))
+              (page-enter next))
+            (begin
+              (and (zero? (system* "ip" "link" "set" ifce "up"))
+                   (zero? (system* "iw" "dev" ifce "connect" (assq-ref ap 
'essid)))
+                   (zero? (system* "dhclient" ifce)))
+              (page-leave))))))
 
     (std-menu-key-handler menu ch)