reproducible Debian: (needed on stretch) also disable ntp.service on future hosts

Signed-off-by: Holger Levsen <holger@layer-acht.org>

50 files changed, 100 insertions, 0 deletions

diff --git a/hosts/bbx15-armhf-rb/etc/rc.local b/hosts/bbx15-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/bbx15-armhf-rb/etc/rc.local
+++ b/hosts/bbx15-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/bpi0-armhf-rb/etc/rc.local b/hosts/bpi0-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/bpi0-armhf-rb/etc/rc.local
+++ b/hosts/bpi0-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/cb3a-armhf-rb/etc/rc.local b/hosts/cb3a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/cb3a-armhf-rb/etc/rc.local
+++ b/hosts/cb3a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/cbxi4a-armhf-rb/etc/rc.local b/hosts/cbxi4a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/cbxi4a-armhf-rb/etc/rc.local
+++ b/hosts/cbxi4a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/cbxi4b-armhf-rb/etc/rc.local b/hosts/cbxi4b-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/cbxi4b-armhf-rb/etc/rc.local
+++ b/hosts/cbxi4b-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/rc.local b/hosts/cbxi4pro0-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/rc.local
+++ b/hosts/cbxi4pro0-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled10-arm64/etc/rc.local b/hosts/codethink-sled10-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled10-arm64/etc/rc.local
+++ b/hosts/codethink-sled10-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled11-arm64/etc/rc.local b/hosts/codethink-sled11-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled11-arm64/etc/rc.local
+++ b/hosts/codethink-sled11-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled12-arm64/etc/rc.local b/hosts/codethink-sled12-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled12-arm64/etc/rc.local
+++ b/hosts/codethink-sled12-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled13-arm64/etc/rc.local b/hosts/codethink-sled13-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled13-arm64/etc/rc.local
+++ b/hosts/codethink-sled13-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled14-arm64/etc/rc.local b/hosts/codethink-sled14-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled14-arm64/etc/rc.local
+++ b/hosts/codethink-sled14-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled15-arm64/etc/rc.local b/hosts/codethink-sled15-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled15-arm64/etc/rc.local
+++ b/hosts/codethink-sled15-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled16-arm64/etc/rc.local b/hosts/codethink-sled16-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled16-arm64/etc/rc.local
+++ b/hosts/codethink-sled16-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/codethink-sled9-arm64/etc/rc.local b/hosts/codethink-sled9-arm64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/codethink-sled9-arm64/etc/rc.local
+++ b/hosts/codethink-sled9-arm64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/ff2a-armhf-rb/etc/rc.local b/hosts/ff2a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/ff2a-armhf-rb/etc/rc.local
+++ b/hosts/ff2a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/ff2b-armhf-rb/etc/rc.local b/hosts/ff2b-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/ff2b-armhf-rb/etc/rc.local
+++ b/hosts/ff2b-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/ff4a-armhf-rb/etc/rc.local b/hosts/ff4a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/ff4a-armhf-rb/etc/rc.local
+++ b/hosts/ff4a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/ff64a-armhf-rb/etc/rc.local b/hosts/ff64a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/ff64a-armhf-rb/etc/rc.local
+++ b/hosts/ff64a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/hb0-armhf-rb/etc/rc.local b/hosts/hb0-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/hb0-armhf-rb/etc/rc.local
+++ b/hosts/hb0-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/jenkins-test-vm/etc/rc.local b/hosts/jenkins-test-vm/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/jenkins-test-vm/etc/rc.local
+++ b/hosts/jenkins-test-vm/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/jenkins/etc/rc.local b/hosts/jenkins/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/jenkins/etc/rc.local
+++ b/hosts/jenkins/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/jtk1a-armhf-rb/etc/rc.local b/hosts/jtk1a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/jtk1a-armhf-rb/etc/rc.local
+++ b/hosts/jtk1a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/jtx1a-armhf-rb/etc/rc.local b/hosts/jtx1a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/jtx1a-armhf-rb/etc/rc.local
+++ b/hosts/jtx1a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/odc2a-armhf-rb/etc/rc.local b/hosts/odc2a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/odc2a-armhf-rb/etc/rc.local
+++ b/hosts/odc2a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/odu3a-armhf-rb/etc/rc.local b/hosts/odu3a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/odu3a-armhf-rb/etc/rc.local
+++ b/hosts/odu3a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/odxu4-armhf-rb/etc/rc.local b/hosts/odxu4-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/odxu4-armhf-rb/etc/rc.local
+++ b/hosts/odxu4-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/odxu4b-armhf-rb/etc/rc.local b/hosts/odxu4b-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/odxu4b-armhf-rb/etc/rc.local
+++ b/hosts/odxu4b-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/odxu4c-armhf-rb/etc/rc.local b/hosts/odxu4c-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/odxu4c-armhf-rb/etc/rc.local
+++ b/hosts/odxu4c-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/opi2a-armhf-rb/etc/rc.local b/hosts/opi2a-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/opi2a-armhf-rb/etc/rc.local
+++ b/hosts/opi2a-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/opi2b-armhf-rb/etc/rc.local b/hosts/opi2b-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/opi2b-armhf-rb/etc/rc.local
+++ b/hosts/opi2b-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/opi2c-armhf-rb/etc/rc.local b/hosts/opi2c-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/opi2c-armhf-rb/etc/rc.local
+++ b/hosts/opi2c-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/p64b-armhf-rb/etc/rc.local b/hosts/p64b-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/p64b-armhf-rb/etc/rc.local
+++ b/hosts/p64b-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/p64c-armhf-rb/etc/rc.local b/hosts/p64c-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/p64c-armhf-rb/etc/rc.local
+++ b/hosts/p64c-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build1-amd64/etc/rc.local b/hosts/profitbricks-build1-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build1-amd64/etc/rc.local
+++ b/hosts/profitbricks-build1-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build10-amd64/etc/rc.local b/hosts/profitbricks-build10-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build10-amd64/etc/rc.local
+++ b/hosts/profitbricks-build10-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build11-amd64/etc/rc.local b/hosts/profitbricks-build11-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build11-amd64/etc/rc.local
+++ b/hosts/profitbricks-build11-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build12-i386/etc/rc.local b/hosts/profitbricks-build12-i386/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build12-i386/etc/rc.local
+++ b/hosts/profitbricks-build12-i386/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build15-amd64/etc/rc.local b/hosts/profitbricks-build15-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build15-amd64/etc/rc.local
+++ b/hosts/profitbricks-build15-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build16-i386/etc/rc.local b/hosts/profitbricks-build16-i386/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build16-i386/etc/rc.local
+++ b/hosts/profitbricks-build16-i386/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build2-i386/etc/rc.local b/hosts/profitbricks-build2-i386/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build2-i386/etc/rc.local
+++ b/hosts/profitbricks-build2-i386/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build3-amd64/etc/rc.local b/hosts/profitbricks-build3-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build3-amd64/etc/rc.local
+++ b/hosts/profitbricks-build3-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build4-amd64/etc/rc.local b/hosts/profitbricks-build4-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build4-amd64/etc/rc.local
+++ b/hosts/profitbricks-build4-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build5-amd64/etc/rc.local b/hosts/profitbricks-build5-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build5-amd64/etc/rc.local
+++ b/hosts/profitbricks-build5-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build6-i386/etc/rc.local b/hosts/profitbricks-build6-i386/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build6-i386/etc/rc.local
+++ b/hosts/profitbricks-build6-i386/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build7-amd64/etc/rc.local b/hosts/profitbricks-build7-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build7-amd64/etc/rc.local
+++ b/hosts/profitbricks-build7-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/profitbricks-build9-amd64/etc/rc.local b/hosts/profitbricks-build9-amd64/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/profitbricks-build9-amd64/etc/rc.local
+++ b/hosts/profitbricks-build9-amd64/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/rpi2b-armhf-rb/etc/rc.local b/hosts/rpi2b-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/rpi2b-armhf-rb/etc/rc.local
+++ b/hosts/rpi2b-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/rpi2c-armhf-rb/etc/rc.local b/hosts/rpi2c-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/rpi2c-armhf-rb/etc/rc.local
+++ b/hosts/rpi2c-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/wbd0-armhf-rb/etc/rc.local b/hosts/wbd0-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/wbd0-armhf-rb/etc/rc.local
+++ b/hosts/wbd0-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date
diff --git a/hosts/wbq0-armhf-rb/etc/rc.local b/hosts/wbq0-armhf-rb/etc/rc.local
index 45688521..95f5f352 100755
--- a/hosts/wbq0-armhf-rb/etc/rc.local
+++ b/hosts/wbq0-armhf-rb/etc/rc.local
@@ -14,8 +14,10 @@ send_back_to_the_future() {
 	# disable systemd date services (and don't fail if systemd ain't running)
 	systemctl disable systemd-timesyncd || true
 	systemctl disable systemd-timedated || true
+	systemctl disable ntp.service || true
 	systemctl stop systemd-timesyncd || true
 	systemctl stop systemd-timedated || true
+	systemctl stop ntp.service || true
 	# set correct date
 	ntpdate -b de.pool.ntp.org
 	# set fake date