[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/197: installer: Connect ethernet interfaces on selection.
From: |
Danny Milosavljevic |
Subject: |
25/197: installer: Connect ethernet interfaces on selection. |
Date: |
Mon, 3 Jul 2017 20:36:54 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 67ed97ea15e672913d9a4192f556fc315733142a
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)
- 16/197: installer: Add new procedure to get the list of volumes., (continued)
- 16/197: installer: Add new procedure to get the list of volumes., Danny Milosavljevic, 2017/07/03
- 15/197: installer: Use %default-subsitute-urls instead of our own variable., Danny Milosavljevic, 2017/07/03
- 19/197: installer: Remove unused procedure., Danny Milosavljevic, 2017/07/03
- 18/197: installer: Handle the 'back' action in the filesystems task., Danny Milosavljevic, 2017/07/03
- 13/197: installer: Add alternate method of finding TZDIR., Danny Milosavljevic, 2017/07/03
- 31/197: installer: Make minumum-store-size variable global., Danny Milosavljevic, 2017/07/03
- 33/197: installer: Improve dependencies on the final task., Danny Milosavljevic, 2017/07/03
- 17/197: installer: Add completion predicate for disk task., Danny Milosavljevic, 2017/07/03
- 21/197: installer: Fix incorrect host in ping task., Danny Milosavljevic, 2017/07/03
- 20/197: installer: Return slurped lines in their correct order., Danny Milosavljevic, 2017/07/03
- 25/197: installer: Connect ethernet interfaces on selection.,
Danny Milosavljevic <=
- 03/197: installer: Remove obsolete procedures/variables, Danny Milosavljevic, 2017/07/03
- 10/197: installer: Perform a task's dependencies prior to the task itself., Danny Milosavljevic, 2017/07/03
- 22/197: installer: Make "interfaces" return an alist., Danny Milosavljevic, 2017/07/03
- 26/197: installer: Let the kernel know about (possibly) changed partitions., Danny Milosavljevic, 2017/07/03
- 27/197: installer: Deal with partition tables which are (partially) corrupt., Danny Milosavljevic, 2017/07/03
- 28/197: installer: Add a variable to represent the minimum recommended store size., Danny Milosavljevic, 2017/07/03
- 32/197: installer: Remove ad-hoc completed predicate and use standard one., Danny Milosavljevic, 2017/07/03
- 34/197: installer: Replace some instances of "car"., Danny Milosavljevic, 2017/07/03
- 40/197: installer: Turn off kernel ring messages to console., Danny Milosavljevic, 2017/07/03
- 37/197: install: Define new procedure pipe-cmd and use it to implement window-pipe., Danny Milosavljevic, 2017/07/03