[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
136/197: installer: No passphrase is needed for clear networks.
From: |
Danny Milosavljevic |
Subject: |
136/197: installer: No passphrase is needed for clear networks. |
Date: |
Mon, 3 Jul 2017 20:37:14 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit c84f7c677a25f89bcaf04024662bf67d6bd77340
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)
- 192/197: installer: Only build if guile-ncurses is available., (continued)
- 192/197: installer: Only build if guile-ncurses is available., Danny Milosavljevic, 2017/07/03
- 68/197: installer: Add new page to set the system role., Danny Milosavljevic, 2017/07/03
- 117/197: installer: Remove unnecessary "begin"., Danny Milosavljevic, 2017/07/03
- 113/197: installer: Explicitly set the #:panel parameter for window creation procedures., Danny Milosavljevic, 2017/07/03
- 122/197: gurses: Populate the choices box in forms., Danny Milosavljevic, 2017/07/03
- 128/197: installer: Remove redundant list of file system types., Danny Milosavljevic, 2017/07/03
- 115/197: installer: New procedure refresh*., Danny Milosavljevic, 2017/07/03
- 153/197: installer: Add optional arguments to addstr*., Danny Milosavljevic, 2017/07/03
- 97/197: installer: Whitespace changes only, Danny Milosavljevic, 2017/07/03
- 139/197: installer: Allow file system specifications to be removed., Danny Milosavljevic, 2017/07/03
- 136/197: installer: No passphrase is needed for clear networks.,
Danny Milosavljevic <=
- 138/197: installer: Clear the mount point field for swap file systems., Danny Milosavljevic, 2017/07/03
- 135/197: installer: Use a "hard" method of rebooting. Do not rely on shepherd., Danny Milosavljevic, 2017/07/03
- 148/197: installer: Support WEP encrypted wireless., Danny Milosavljevic, 2017/07/03
- 176/197: installer: Fix incorrect symbol in generated config file., Danny Milosavljevic, 2017/07/03
- 177/197: installer: Remove non-existant supplementary group., Danny Milosavljevic, 2017/07/03
- 182/197: installer: Kill old dhclient instance before starting new one., Danny Milosavljevic, 2017/07/03
- 189/197: installer: Fix buglet where keys were sometimes ignored in users page., Danny Milosavljevic, 2017/07/03
- 179/197: installer: Mount all partitions instead of just the root., Danny Milosavljevic, 2017/07/03
- 190/197: gurses: forms: Minor refactor., Danny Milosavljevic, 2017/07/03
- 194/197: guix system: Remove outdated (gnu system grub) import., Danny Milosavljevic, 2017/07/03