[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
182/197: installer: Kill old dhclient instance before starting new one.
From: |
Danny Milosavljevic |
Subject: |
182/197: installer: Kill old dhclient instance before starting new one. |
Date: |
Mon, 3 Jul 2017 20:37:22 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit fb6ea76cbc6d647ba4e780a0299b8ef9862c4220
Author: John Darrington <address@hidden>
Date: Tue Feb 14 15:40:38 2017 +0100
installer: Kill old dhclient instance before starting new one.
* gnu/system/installer/network.scm (dhclient):: New procedure.
* gnu/system/installer/wireless.scm (wireless-page-key-handler): Use it.
---
gnu/system/installer/network.scm | 9 ++++++++-
gnu/system/installer/wireless.scm | 6 ++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/system/installer/network.scm b/gnu/system/installer/network.scm
index 2ddaaed..60ae111 100644
--- a/gnu/system/installer/network.scm
+++ b/gnu/system/installer/network.scm
@@ -31,10 +31,17 @@
#:use-module (ncurses curses)
#:use-module (guix store)
+ #:export (dhclient)
#:export (make-network-page))
(include "i18n.scm")
+
+(define (dhclient interface)
+ (system* "dhclient" "-r" interface)
+ (zero? (system* "dhclient" interface)))
+
+
(define (make-network-page parent title)
(make-page (page-surface parent)
title
@@ -125,7 +132,7 @@
(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)))))))
+ (dhclient (assq-ref item 'name))))))
((buttons-key-matches-symbol? nav ch 'test)
(let ((next (make-page (page-surface page)
diff --git a/gnu/system/installer/wireless.scm
b/gnu/system/installer/wireless.scm
index e195d1d..f45ae64 100644
--- a/gnu/system/installer/wireless.scm
+++ b/gnu/system/installer/wireless.scm
@@ -20,6 +20,7 @@
#:use-module (gnu system installer page)
#:use-module (gnu system installer ping)
#:use-module (gnu system installer passphrase)
+ #:use-module (gnu system installer network)
#:use-module (gnu system installer misc)
#:use-module (gnu system installer utils)
#:use-module (ice-9 format)
@@ -48,6 +49,7 @@
(define my-buttons `((cancel ,(M_ "Canc_el") #t)))
+
(define (wireless-page-key-handler page ch)
(let ((nav (page-datum page 'navigation))
(menu (page-datum page 'menu))
@@ -87,7 +89,7 @@
(begin
(and (zero? (system* "ip" "link" "set" ifce "up"))
(zero? (system* "iw" "dev" ifce "connect" (assq-ref ap
'essid)))
- (zero? (system* "dhclient" ifce)))
+ (dhclient ifce))
(page-leave))))))
(std-menu-key-handler menu ch)
@@ -273,4 +275,4 @@ network={
(with-output-to-file "/dev/null"
(lambda ()
(and (zero? (system* "wpa_supplicant" "-c" filename "-i" ifce "-B"))
- (zero? (system* "dhclient" ifce)))))))))
+ (dhclient ifce))))))))
- 115/197: installer: New procedure refresh*., (continued)
- 115/197: installer: New procedure refresh*., Danny Milosavljevic, 2017/07/03
- 153/197: installer: Add optional arguments to addstr*., Danny Milosavljevic, 2017/07/03
- 97/197: installer: Whitespace changes only, Danny Milosavljevic, 2017/07/03
- 139/197: installer: Allow file system specifications to be removed., Danny Milosavljevic, 2017/07/03
- 136/197: installer: No passphrase is needed for clear networks., Danny Milosavljevic, 2017/07/03
- 138/197: installer: Clear the mount point field for swap file systems., Danny Milosavljevic, 2017/07/03
- 135/197: installer: Use a "hard" method of rebooting. Do not rely on shepherd., Danny Milosavljevic, 2017/07/03
- 148/197: installer: Support WEP encrypted wireless., Danny Milosavljevic, 2017/07/03
- 176/197: installer: Fix incorrect symbol in generated config file., Danny Milosavljevic, 2017/07/03
- 177/197: installer: Remove non-existant supplementary group., Danny Milosavljevic, 2017/07/03
- 182/197: installer: Kill old dhclient instance before starting new one.,
Danny Milosavljevic <=
- 189/197: installer: Fix buglet where keys were sometimes ignored in users page., Danny Milosavljevic, 2017/07/03
- 179/197: installer: Mount all partitions instead of just the root., Danny Milosavljevic, 2017/07/03
- 190/197: gurses: forms: Minor refactor., Danny Milosavljevic, 2017/07/03
- 194/197: guix system: Remove outdated (gnu system grub) import., Danny Milosavljevic, 2017/07/03
- 197/197: installer: Use "G_" instead of "_"., Danny Milosavljevic, 2017/07/03
- 188/197: installer: Go back to main menu after "cancel", Danny Milosavljevic, 2017/07/03
- 184/197: installer: Create dedicated module to maintainer the page stack., Danny Milosavljevic, 2017/07/03
- 126/197: installer: mount-points page: Enlarge the forms window., Danny Milosavljevic, 2017/07/03
- 96/197: installer: Changed N_ to M_ since N_ is used for another purpose in guix/ui.scm, Danny Milosavljevic, 2017/07/03
- 142/197: gurses: xchar->char: New procedure., Danny Milosavljevic, 2017/07/03