Commit a2c69a18 authored by David Johnson's avatar David Johnson

Fix doubly-run ntp on Ubuntu 14.

/etc/init.d/ntp was being run twice on Ubuntu14 (and was failing slowly
the first time) because of the presence of
/etc/network/if-up.d/ntpdate... which would run ntpdate then
/etc/init.d/ntp via invoke-rc.d... so we would see a double start with
lots of delay.

So now we overwrite that hook script!  Ugh.
parent de823edd
#
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -66,6 +66,7 @@ dir-install:
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/init
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/init.d
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/network
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/network/if-up.d
$(INSTALL) -m 755 -o root -g root -d $(SYSETCDIR)/rsyslog.d
common-install: dir-install
......@@ -99,6 +100,7 @@ sysetc-fixup:
rm -f $(SYSETCDIR)/rsyslog.d/60-emulab.conf
$(INSTALL) -m 755 $(SRCDIR)/rc.local $(SYSETCDIR)/rc.local
$(INSTALL) -m 644 $(SRCDIR)/interfaces $(SYSETCDIR)/network/interfaces
$(INSTALL) -m 755 $(SRCDIR)/ntpdate-if-up.d.sh $(SYSETCDIR)/network/if-up.d/ntpdate
$(INSTALL) -m 755 $(SRCDIR)/ntp $(SYSETCDIR)/init.d/
script-install: dir-install $(SCRIPTS)
......
#!/bin/sh
#
# We don't want to run the default Debian ntpdate package if-up hook
# (/etc/network/if-up.d/ntpdate); so we overwrite it with this file.
#
exit 0
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