[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
151/197: installer: Avoid wpa_supplicant's output causing screen damage.
From: |
Danny Milosavljevic |
Subject: |
151/197: installer: Avoid wpa_supplicant's output causing screen damage. |
Date: |
Mon, 3 Jul 2017 20:37:16 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit dc97547f119993bb7e66bd84d284f853c92d946b
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)))))))))
- 103/197: installer: Avoid exception when the device to format cannot be found., (continued)
- 103/197: installer: Avoid exception when the device to format cannot be found., Danny Milosavljevic, 2017/07/03
- 116/197: installer: Fix bug in config generation., Danny Milosavljevic, 2017/07/03
- 105/197: installer: Extend the 'file-system' concept to include swap spaces., Danny Milosavljevic, 2017/07/03
- 83/197: installer: "Setup" --> "Set up", Danny Milosavljevic, 2017/07/03
- 92/197: installer: Remove mkfs capability from mount points page., Danny Milosavljevic, 2017/07/03
- 118/197: installer: Distinguish between Wifi encryption methods., Danny Milosavljevic, 2017/07/03
- 127/197: gurses: Remove box from form popup window., Danny Milosavljevic, 2017/07/03
- 123/197: installer: Add a popup window for forms which have multiple choice fields., Danny Milosavljevic, 2017/07/03
- 121/197: installer: Note which types of file system are supported., Danny Milosavljevic, 2017/07/03
- 141/197: gurses: Avoid one usage of car and cdr., Danny Milosavljevic, 2017/07/03
- 151/197: installer: Avoid wpa_supplicant's output causing screen damage.,
Danny Milosavljevic <=
- 99/197: installer: Exit the format page after all partitions are successfully formatted., Danny Milosavljevic, 2017/07/03
- 101/197: installer: Replace one usage of car with match., Danny Milosavljevic, 2017/07/03
- 109/197: installer: Fix bug where the selected item of main page was not indicated., Danny Milosavljevic, 2017/07/03
- 104/197: installer: Support btrfs, Danny Milosavljevic, 2017/07/03
- 111/197: gurses: Change highlighting from bold to inverse., Danny Milosavljevic, 2017/07/03
- 108/197: installer: Do not add file systems which are invalid., Danny Milosavljevic, 2017/07/03
- 164/197: gurses: Use match instead of car., Danny Milosavljevic, 2017/07/03
- 170/197: installer: Remove unused procedure., Danny Milosavljevic, 2017/07/03
- 152/197: installer: New file i18n.scm., Danny Milosavljevic, 2017/07/03
- 110/197: installer: Add an explanatory text to the main page., Danny Milosavljevic, 2017/07/03