me
/
guix
Archived
1
0
Fork 0
Code

services: ntpd: Add 'allow-large-adjustment?' knob. 

Suggested by Leo Famulari.

* gnu/services/networking.scm (<ntp-configuration>)[allow-large-adjustment?]:
New field.
(ntp-shepherd-service): Honor it.
(ntp-service): Add #:allow-large-adjustment? and honor it.
* doc/guix.texi (Networking Services): Document it.
master
Ludovic Courtès 2016-10-20 15:14:17 +02:00
parent 6d3dda4ff5
commit dc0322b511
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/guix.texi
View File

@ -8284,10 +8284,13 @@ configure networking."
@end deffn @end deffn
@deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @ @deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @
[#:servers @var{%ntp-servers}] [#:servers @var{%ntp-servers}] @
[#:allow-large-adjustment? #f]
Return a service that runs the daemon from @var{ntp}, the Return a service that runs the daemon from @var{ntp}, the
@uref{http://www.ntp.org, Network Time Protocol package}. The daemon will @uref{http://www.ntp.org, Network Time Protocol package}. The daemon will
keep the system clock synchronized with that of @var{servers}. keep the system clock synchronized with that of @var{servers}.
@var{allow-large-adjustment?} determines whether @command{ntpd} is allowed to
make an initial adjustment of more than 1,000 seconds.
@end deffn @end deffn
@defvr {Scheme Variable} %ntp-servers @defvr {Scheme Variable} %ntp-servers

23
gnu/services/networking.scm
View File

@ -265,11 +265,13 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
ntp-configuration? ntp-configuration?
(ntp ntp-configuration-ntp (ntp ntp-configuration-ntp
(default ntp)) (default ntp))
(servers ntp-configuration-servers)) (servers ntp-configuration-servers)
(allow-large-adjustment? ntp-allow-large-adjustment?
(default #f)))
(define ntp-shepherd-service (define ntp-shepherd-service
(match-lambda (match-lambda
(($ <ntp-configuration> ntp servers) (($ <ntp-configuration> ntp servers allow-large-adjustment?)
(let () (let ()
;; TODO: Add authentication support. ;; TODO: Add authentication support.
(define config (define config
@ -296,7 +298,10 @@ restrict -6 ::1\n"))
(requirement '(user-processes networking)) (requirement '(user-processes networking))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (string-append #$ntp "/bin/ntpd") "-n" (list (string-append #$ntp "/bin/ntpd") "-n"
"-c" #$ntpd.conf "-u" "ntpd"))) "-c" #$ntpd.conf "-u" "ntpd"
#$@(if allow-large-adjustment?
'("-g")
'()))))
(stop #~(make-kill-destructor)))))))) (stop #~(make-kill-destructor))))))))
(define %ntp-accounts (define %ntp-accounts
@ -331,12 +336,18 @@ restrict -6 ::1\n"))
ntp-service-activation))))) ntp-service-activation)))))
(define* (ntp-service #:key (ntp ntp) (define* (ntp-service #:key (ntp ntp)
(servers %ntp-servers)) (servers %ntp-servers)
allow-large-adjustment?)
"Return a service that runs the daemon from @var{ntp}, the "Return a service that runs the daemon from @var{ntp}, the
@uref{http://www.ntp.org, Network Time Protocol package}. The daemon will @uref{http://www.ntp.org, Network Time Protocol package}. The daemon will
keep the system clock synchronized with that of @var{servers}." keep the system clock synchronized with that of @var{servers}.
@var{allow-large-adjustment?} determines whether @command{ntpd} is allowed to
make an initial adjustment of more than 1,000 seconds."
(service ntp-service-type (service ntp-service-type
(ntp-configuration (ntp ntp) (servers servers)))) (ntp-configuration (ntp ntp)
(servers servers)
(allow-large-adjustment?
allow-large-adjustment?))))
;;; ;;;