This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 836beed08e Revert "services: nscd: Create /etc/resolv.conf if it does
not exist."
836beed08e is described below
commit 836beed08e1d392fb3686852ecc749d9cd3117a7
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Aug 24 16:20:46 2026 +0900
Revert "services: nscd: Create /etc/resolv.conf if it does not exist."
This reverts commits 49f9d7f697d19870f01104cdb6a90a32aea87679 and
c298fb133acbdc17e05a79c10ab9a9e214368264. Since glibc version 2.22 (Guix
was
already on 2.25 when these commits were introduced), nscd's inotify support
is
improved and can track a newly added /etc/resolv.conf. There is no need to
create it beforehand.
Fixes: #10192
Reported-by: brian cully <[email protected]>
---
gnu/services/base.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index e5062a7211..5108187d1e 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1639,16 +1639,7 @@ the tty to run, among other things."
#~(begin
(use-modules (guix build utils))
(mkdir-p "/var/run/nscd")
- (mkdir-p "/var/db/nscd") ;for the persistent cache
-
- ;; In libc 2.25 nscd uses inotify to watch /etc/resolv.conf, but only if
- ;; that file exists when it is started. Thus create it here. Note: on
- ;; some systems, such as when NetworkManager is used, /etc/resolv.conf
- ;; is a symlink, hence 'lstat'.
- (unless (false-if-exception (lstat "/etc/resolv.conf"))
- (call-with-output-file "/etc/resolv.conf"
- (lambda (port)
- (display "# This is a placeholder.\n" port))))))
+ (mkdir-p "/var/db/nscd"))) ;for the persistent cache
(define nscd-service-type
(service-type (name 'nscd)
