[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/22: installer: Connect ethernet interfaces on selection.
From: |
John Darrington |
Subject: |
06/22: installer: Connect ethernet interfaces on selection. |
Date: |
Tue, 27 Dec 2016 06:02:08 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 042a8d630cd0a5ee00c9c6dd526cce23757a5e4e
Author: John Darrington <address@hidden>
Date: Sat Dec 24 12:27:21 2016 +0100
installer: Connect ethernet interfaces on selection.
* gnu/system/installer/network.scm (network-page-key-handler) : Add handler
for
'continue and select cases.
---
gnu/system/installer/network.scm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index db49b0f..e17f940 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -96,13 +96,12 @@
(assq-ref (menu-get-current-item menu)
'name))))
(set! page-stack (cons next page-stack))
((page-refresh next) next)))
-
-
- ((buttons-key-matches-symbol? nav ch 'continue)
- (delwin (outer (page-wwin page)))
- (set! page-stack (cdr page-stack))
- ((page-refresh (car page-stack)) (car page-stack)))
+ ((select-key? ch)
+ (let ((item (menu-get-current-item menu)))
+ (when (eq? (assq-ref item 'class) 'ethernet)
+ (and (zero? (system* "ip" "link" "set" (assq-ref item 'name) "up"))
+ (zero? (system* "dhclient" (assq-ref item 'name)))))))
((buttons-key-matches-symbol? nav ch 'test)
(let ((next (make-page (page-surface page)
@@ -111,7 +110,12 @@
ping-page-key-handler)))
(set! page-stack (cons next page-stack))
- ((page-refresh next) next))))
+ ((page-refresh next) next)))
+
+ ((buttons-key-matches-symbol? nav ch 'continue)
+ (delwin (outer (page-wwin page)))
+ (delwin (inner (page-wwin page)))
+ (set! page-stack (cdr page-stack))))
(std-menu-key-handler menu ch))
#f)
- branch wip-installer updated (704f546 -> d654694), John Darrington, 2016/12/27
- 01/22: installer: Return slurped lines in their correct order., John Darrington, 2016/12/27
- 15/22: installer: Remove ad-hoc completed predicate and use standard one., John Darrington, 2016/12/27
- 02/22: installer: Fix incorrect host in ping task., John Darrington, 2016/12/27
- 06/22: installer: Connect ethernet interfaces on selection.,
John Darrington <=
- 14/22: installer: Make minumum-store-size variable global., John Darrington, 2016/12/27
- 04/22: installer: Use a cleaner way of generating the lspci information., John Darrington, 2016/12/27
- 16/22: installer: Improve dependencies on the final task., John Darrington, 2016/12/27
- 22/22: gnu: Add guix to the path environment for the guix-installer service., John Darrington, 2016/12/27
- 09/22: installer: Add a variable to represent the minimum recommended store size., John Darrington, 2016/12/27
- 17/22: installer: Replace some instances of "car"., John Darrington, 2016/12/27
- 20/22: install: Define new procedure pipe-cmd and use it to implement window-pipe., John Darrington, 2016/12/27
- 03/22: installer: Make "interfaces" return an alist., John Darrington, 2016/12/27
- 13/22: installer: Add path to mount/umount commands in installer service., John Darrington, 2016/12/27
- 10/22: gnu: Add service to start the installer in installation-os., John Darrington, 2016/12/27