[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/20: installer: Use "lspci -mm" instead of "lspci -m".
From: |
John Darrington |
Subject: |
14/20: installer: Use "lspci -mm" instead of "lspci -m". |
Date: |
Thu, 12 Jan 2017 20:41:04 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 137c5e6d774f544433ba4068eda507521e2a4c51
Author: John Darrington <address@hidden>
Date: Tue Jan 10 17:23:41 2017 +0100
installer: Use "lspci -mm" instead of "lspci -m".
* gnu/system/installer/network.scm (network-page-init): Use the new version
of
lspci and thus avoid a cdr.
---
gnu/system/installer/network.scm | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 1667abc..d07791e 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -171,20 +171,13 @@
((bus device . func)
(format #f "~50a ~6a ~a"
(car (assoc-ref
- (cdr
- ;; It seems that lspci always prints an initial
- ;; "Device: <bus>:<device>.<func> line. We are
- ;; not interested in this, and it conflicts with
- ;; the "real" (descriptive) Device: line which we
- ;; want. Hence the above cdr strips the first
line
- ;; away.
- (slurp (format #f "lspci -vm -s~x:~x.~x"
- (string->number bus 10)
- (string->number device 10)
- (if (null? func) 0
- (string->number func 10)))
- (lambda (x)
- (string-split x #\tab))))
+ (slurp (format #f "lspci -v -mm -s~x:~x.~x"
+ (string->number bus 10)
+ (string->number device 10)
+ (if (null? func) 0
+ (string->number func 10)))
+ (lambda (x)
+ (string-split x #\tab)))
"Device:"))
state flags))))))))))
- branch wip-installer updated (9c4d060 -> 3673cd8), John Darrington, 2017/01/12
- 02/20: installer: Remove explicit calls to curs-set from pages., John Darrington, 2017/01/12
- 01/20: installer: Correct behaviour of push-cursor and pop-cursor procedures., John Darrington, 2017/01/12
- 12/20: installer: "Setup" --> "Set up", John Darrington, 2017/01/12
- 03/20: installer: Remove pointless calls to delwin., John Darrington, 2017/01/12
- 14/20: installer: Use "lspci -mm" instead of "lspci -m".,
John Darrington <=
- 17/20: installer: Use a cleaner method of detecting wireless capability for ethernet interfaces., John Darrington, 2017/01/12
- 09/20: installer: Make all windows with ports scrollable., John Darrington, 2017/01/12
- 08/20: installer: Ignore case in button accelerators., John Darrington, 2017/01/12
- 05/20: installer: New procedure: page-enter., John Darrington, 2017/01/12
- 11/20: installer: Add installer source files to the manifest of translatables., John Darrington, 2017/01/12
- 15/20: installer: slurp: Ignore blank lines in output., John Darrington, 2017/01/12
- 04/20: installer: New procedure "page-leave"., John Darrington, 2017/01/12
- 18/20: guix: Add IFF_RUNNING to exported syscall constants., John Darrington, 2017/01/12
- 20/20: installer: Enable direct scrolling to top or bottom of menus., John Darrington, 2017/01/12
- 19/20: installer: Make the network menu more reliable., John Darrington, 2017/01/12