diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/services/networking.scm | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'gnu/services/networking.scm')
| -rw-r--r-- | gnu/services/networking.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index eeb1487116..4e1055609d 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2021 Christopher Lemmer Webber <cwebber@dustycloud.org> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> +;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -363,8 +364,9 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."))) (lambda _ (display "")))) ;; Validate the config. (invoke/quiet - #$(file-append package "/sbin/dhcpd") "-t" "-cf" - #$config-file)))))) + #$(file-append package "/sbin/dhcpd") + #$(string-append "-" version) + "-t" "-cf" #$config-file)))))) (define dhcpd-service-type (service-type |