From c19673b3a6bc7d2413f0cdba62a2cc8314a646ab Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 17 Aug 2026 14:27:45 +0900 Subject: gnu: dhcpcd: Add openresolv's 'resolveconf' PATH wrapper. [#:phases] {wrap-hooks} : Add resolvconf's bin directory. --- gnu/packages/admin.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 30fc1542c8e..c961eba8a41 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1962,8 +1962,8 @@ maintenance releases.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1z5rpi0n2vwhkh3c4d0dxwp38fl18br58jpy7kzh97gzg3gpk5dl")))) - (inputs (list bash-minimal coreutils-minimal eudev sed)) + (base32 "1mdi4pm44pha47ivfn2gsf9w9rdpyw4q19x4myvkbifjg6lf7r4i")))) + (inputs (list bash-minimal coreutils-minimal eudev openresolv sed)) (build-system gnu-build-system) (arguments (list @@ -1989,13 +1989,18 @@ maintenance releases.") (setenv "HOST_SH" (which "sh")))) (add-after 'install 'wrap-hooks (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((sed (search-input-file inputs "/bin/sed")) - (rm (search-input-file inputs "/bin/rm"))) + ;; It's important that the 'resolvconf' binary used be that of + ;; openresolv, which is the one responsible for maintaining + ;; /etc/resolv.conf in Guix. + (let* ((resolvconf (search-input-file inputs "sbin/resolvconf")) + (rm (search-input-file inputs "bin/rm")) + (sed (search-input-file inputs "bin/sed"))) (wrap-program (string-append #$output "/libexec/dhcpcd-run-hooks") - `("PATH" ":" suffix - (,(dirname sed) - ,(dirname rm)))))))))) + (list "PATH" 'suffix + (list (dirname resolvconf) + (dirname rm) + (dirname sed)))))))))) (home-page "https://roy.marples.name/projects/dhcpcd") (synopsis "Feature-rich DHCP and DHCPv6 client") (description -- cgit v1.2.3