Re: [PATCH 1/1] services: ntpd: Make large clock adjustments if necessary.

[ludo@gnu.org (Ludovic Courtès)]

Leo Famulari <leo@famulari.name> skribis:

> On Wed, Oct 19, 2016 at 10:49:32PM +0200, Ludovic Courtès wrote:
>> diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
>> index 7495179..ce281c5 100644
>> --- a/gnu/services/networking.scm
>> +++ b/gnu/services/networking.scm
>> @@ -265,11 +265,13 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
>>    ntp-configuration?
>>    (ntp      ntp-configuration-ntp
>>              (default ntp))
>> -  (servers  ntp-configuration-servers))
>> +  (servers  ntp-configuration-servers)
>> +  (allow-large-adjustment? ntp-allow-large-adjustment?
>> +                           (default #f)))
>>  
>>  (define ntp-shepherd-service
>>    (match-lambda
>> -    (($ <ntp-configuration> ntp servers)
>> +    (($ <ntp-configuration> ntp servers allow-large-adjustment?)
>>       (let ()
>>         ;; TODO: Add authentication support.
>>         (define config
>> @@ -296,7 +298,10 @@ restrict -6 ::1\n"))
>>                (requirement '(user-processes networking))
>>                (start #~(make-forkexec-constructor
>>                          (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))))))))
>>  
>>  (define %ntp-accounts
>> @@ -331,10 +336,13 @@ restrict -6 ::1\n"))
>>                                            ntp-service-activation)))))
>>  
>>  (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
>>  @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
>>             (ntp-configuration (ntp ntp) (servers servers))))
>>  
>
>> 
>> If that’s fine with you, I’ll commit it with a doc update.
>
> It looks good to me! Once we can run GuixSD on armhf or aarch64, I bet
> we will have lots of users with hardware lacking a battery-backed real
> time clock, and they will appreciate this option.

Good point.  Pushed as dc0322b51111d12e1d97e2cc456100c44dd31bb6.

Ludo’.