Commit 86cfefd8 authored by David Johnson's avatar David Johnson

Move Ubuntu16 ntp to using modern Linux default of /var/lib/ntp/ntp.drift .

(ntpd is really dumb, and attempts to create its temp drift file as
$DRIFTFILE.tmp only.  Obviously we can't give ntp group-write into /etc.)
parent bf727079
......@@ -102,6 +102,7 @@ common-sysetc-install: dir-install
sysetc-fixup:
rm -rf $(SYSETCDIR)/modules.conf $(SYSETCDIR)/cron.pend \
$(SYSETCDIR)/sysconfig $(SYSETCDIR)/init.d/ntpd
rm -f $(SYSETCDIR)/ntp.drift
rm -f $(SYSETCDIR)/dhclient-enter-hooks $(SYSETCDIR)/dhclient-exit-hooks
rm -f $(SYSETCDIR)/rc.local
......@@ -117,8 +118,7 @@ sysetc-install: dir-install
$(INSTALL) -m 644 $(SRCDIR)/interfaces $(SYSETCDIR)/network/interfaces
$(INSTALL) -m 644 $(SRCDIR)/sudoers $(SYSETCDIR)/sudoers.d/99-emulab
$(INSTALL) -m 644 $(SRCDIR)/ntp.conf $(SYSETCDIR)/ntp.conf
$(INSTALL) -m 644 -o ntp -g ntp /dev/null /etc/ntp.drift
ln -sf /etc/ntp.drift /var/lib/ntp/ntp.drift
$(INSTALL) -m 644 -o ntp -g ntp /dev/null /var/lib/ntp/ntp.drift
$(INSTALL) -m 644 $(SRCDIR)/99-emulab-control-network.rules \
$(SYSETCDIR)/udev/rules.d/99-emulab-control-network.rules
......
......@@ -2,9 +2,7 @@
# Generic Emulab NTP client configuration.
#
# XXX not standard for anyone anymore, but it is the LCD for all our images
# (Ubuntu default is /var/lib/ntp/ntp.drift)
driftfile /etc/ntp.drift
driftfile /var/lib/ntp/ntp.drift
# disallow most accesses, most importantly 'monlist' queries
# XXX again, not ideal but works with really old ntpds
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment