[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/18: installer: Avoid wpa_supplicant's output causing screen damage.
From: |
John Darrington |
Subject: |
01/18: installer: Avoid wpa_supplicant's output causing screen damage. |
Date: |
Thu, 2 Feb 2017 18:13:04 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 69ac9c6a4936106d395132b59611cb4f77ef3306
Author: John Darrington <address@hidden>
Date: Sun Jan 29 08:49:34 2017 +0100
installer: Avoid wpa_supplicant's output causing screen damage.
* gnu/system/installer/wireless.scm (wireless-connect): Wrap wpa_supplicant
in call-with-output-file
---
gnu/system/installer/wireless.scm | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/gnu/system/installer/wireless.scm
b/gnu/system/installer/wireless.scm
index a10d2b9..23f4653 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -253,27 +253,28 @@
(let ((essid (assq-ref access-point 'essid))
(encr (assq-ref access-point 'encryption)))
- (call-with-temporary-output-file
- (lambda (filename port)
-
- (format port
- (if (eq? encr 'wep) "
+ (call-with-temporary-output-file
+ (lambda (filename port)
+ (format port
+ (if (eq? encr 'wep) "
network={
\tssid=\"~a\"
\tkey_mgmt=NONE
\twep_key0=\"~a\"
}
"
-"
+ "
network={
\tssid=\"~a\"
\tkey_mgmt=WPA-PSK
\tpsk=\"~a\"
}
")
- essid
- passphrase)
- (force-output port)
-
- (and (zero? (system* "wpa_supplicant" "-c" filename "-i" ifce "-B"))
- (zero? (system* "dhclient" ifce)))))))
+ essid
+ passphrase)
+ (force-output port)
+
+ (with-output-to-file "/dev/null"
+ (lambda ()
+ (and (zero? (system* "wpa_supplicant" "-c" filename "-i" ifce "-B"))
+ (zero? (system* "dhclient" ifce)))))))))
- branch wip-installer updated (9ff399e -> 688f4f7), John Darrington, 2017/02/02
- 04/18: installer: Add optional arguments to addstr*., John Darrington, 2017/02/02
- 02/18: installer: New gettext keyword M_., John Darrington, 2017/02/02
- 01/18: installer: Avoid wpa_supplicant's output causing screen damage.,
John Darrington <=
- 05/18: installer: Main page: Redisplay translatable strings upon refresh., John Darrington, 2017/02/02
- 09/18: installer: Correct placement of gettext call., John Darrington, 2017/02/02
- 08/18: installer: Replace 'file-browser' with 'key-map'., John Darrington, 2017/02/02
- 06/18: installer: Use _ instead of M_ for host-name-refresh., John Darrington, 2017/02/02
- 14/18: gurses: Cache the windows of buttons., John Darrington, 2017/02/02
- 16/18: installer: New procedure key-value-slurp., John Darrington, 2017/02/02
- 18/18: installer: Fix bug when changing languages., John Darrington, 2017/02/02
- 07/18: installer: New page to select language., John Darrington, 2017/02/02
- 10/18: installer: Fix i18n in dialogs., John Darrington, 2017/02/02
- 17/18: installer: Provide verbose description of locale., John Darrington, 2017/02/02