summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-07-24 11:51:27 -0400
committerHolger Levsen <holger@layer-acht.org>2016-07-24 11:51:27 -0400
commit8adab9bb7f5cbb80a655443a37ee7d3390f2a877 (patch)
treea6fd20b38c73294029ade7bf04d0e51ce01324c1
parent60d6df627476679512ee4807b5fce3e4c36c35c7 (diff)
downloadjenkins.debian.net-8adab9bb7f5cbb80a655443a37ee7d3390f2a877.tar.xz
force fix ntp
-rwxr-xr-xhosts/profitbricks-build5-amd64/etc/rc.local2
-rwxr-xr-xhosts/profitbricks-build6-i386/etc/rc.local2
-rwxr-xr-xupdate_jdn.sh5
3 files changed, 7 insertions, 2 deletions
diff --git a/hosts/profitbricks-build5-amd64/etc/rc.local b/hosts/profitbricks-build5-amd64/etc/rc.local
index 59131fcb..b3a760e4 100755
--- a/hosts/profitbricks-build5-amd64/etc/rc.local
+++ b/hosts/profitbricks-build5-amd64/etc/rc.local
@@ -13,6 +13,8 @@
echo "$(date -u) - system was rebooted" | mail -s "$(hostname -f) rebooted" root
+# stop ntp
+service ntp stop || true
# disable systemd date services (and don't fail if systemd ain't running)
systemctl disable systemd-timesyncd
systemctl disable systemd-timedated
diff --git a/hosts/profitbricks-build6-i386/etc/rc.local b/hosts/profitbricks-build6-i386/etc/rc.local
index 59131fcb..b3a760e4 100755
--- a/hosts/profitbricks-build6-i386/etc/rc.local
+++ b/hosts/profitbricks-build6-i386/etc/rc.local
@@ -13,6 +13,8 @@
echo "$(date -u) - system was rebooted" | mail -s "$(hostname -f) rebooted" root
+# stop ntp
+service ntp stop || true
# disable systemd date services (and don't fail if systemd ain't running)
systemctl disable systemd-timesyncd
systemctl disable systemd-timedated
diff --git a/update_jdn.sh b/update_jdn.sh
index 07260684..7a03540a 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -33,8 +33,9 @@ explain "$(date) - begin deployment update."
# run update at current date
case $HOSTNAME in
profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386)
- # set correct date (if ntpdate is installed)
- [ ! -f /usr/sbin/ntpdate ] || sudo ntpdate -b de.pool.ntp.org
+ # set correct date
+ sudo service ntp stop
+ sudo ntpdate -b de.pool.ntp.org
;;
*) ;;
esac