nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: dhcp-client: Start 'dhclient' in "no wait" mode. 

* gnu/services/networking.scm (dhcp-client-service): Pass '-nw' to
  'dhclient'.
This commit is contained in:
Ludovic Courtès 2014-09-17 09:27:07 +02:00
parent 6a3f4c74fd
commit f02f65efb4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/services/networking.scm
View File

@ -107,10 +107,16 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
(with-monad %store-monad (with-monad %store-monad
(return (service (return (service
(documentation (documentation "Set up networking via DHCP.")
"Set up networking via DHCP.")
(requirement '(user-processes udev)) (requirement '(user-processes udev))
;; XXX: Running with '-nw' ("no wait") avoids blocking for a
;; minute when networking is unavailable, but also means that the
;; interface is not up yet when 'start' completes. To wait for
;; the interface to be ready, one should instead monitor udev
;; events.
(provision '(networking)) (provision '(networking))
(start #~(lambda _ (start #~(lambda _
;; When invoked without any arguments, 'dhclient' ;; When invoked without any arguments, 'dhclient'
;; discovers all non-loopback interfaces *that are ;; discovers all non-loopback interfaces *that are
@ -121,7 +127,8 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
(ifaces (filter valid? (ifaces (filter valid?
(all-network-interfaces))) (all-network-interfaces)))
(pid (fork+exec-command (pid (fork+exec-command
(cons* #$dhclient "-pf" #$pid-file (cons* #$dhclient "-nw"
"-pf" #$pid-file
ifaces)))) ifaces))))
(and (zero? (cdr (waitpid pid))) (and (zero? (cdr (waitpid pid)))
(call-with-input-file #$pid-file read))))) (call-with-input-file #$pid-file read)))))