From c217cbd84d7aee7414945a6cf85e1d704fff6e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 9 May 2015 22:28:03 +0200
Subject: [PATCH] services: dhcp-client: Better track dhclient's PID.
* gnu/services/networking.scm (dhcp-client-service)[start]: Remove
PID-FILE first. When 'call-with-input-file' throws ENOENT, try
again.
---
gnu/services/networking.scm | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index f9d262d9772..33ecf9ccd30 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -165,6 +165,8 @@ (define pid-file
(provision '(networking))
(start #~(lambda _
+ (false-if-exception (delete-file #$pid-file))
+
;; When invoked without any arguments, 'dhclient'
;; discovers all non-loopback interfaces *that are
;; up*. However, the relevant interfaces are
@@ -178,7 +180,19 @@ (define pid-file
"-pf" #$pid-file
ifaces))))
(and (zero? (cdr (waitpid pid)))
- (call-with-input-file #$pid-file read)))))
+ (let loop ()
+ (catch 'system-error
+ (lambda ()
+ (call-with-input-file #$pid-file read))
+ (lambda args
+ ;; 'dhclient' returned before PID-FILE
+ ;; was created, so try again.
+ (let ((errno (system-error-errno args)))
+ (if (= ENOENT errno)
+ (begin
+ (sleep 1)
+ (loop))
+ (apply throw args))))))))))
(stop #~(make-kill-destructor))))))
(define %ntp-servers
--
GitLab