From dd694afd5e2cea1234ffb99d8d3955622afee5b7 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Mon, 19 Mar 2018 12:20:00 +0100
Subject: [PATCH] update-systemd-from-27-to-238.sh: Do not replace ntp

One issue with systemd-timesyncd was, that it turned the
time backwards due to some incompatible setting here (fixed by #675).

Another issues is, that is doesn't sync with time.molgen.mpg.de but with
some external server (ntps1-0.cs.tu-berlin.de).

Additionally, ntp.service needs to be started on time.molgen.mpg.de,
because non-mariux systems synchronize with it, too.

We know that ntp is working the way we want, which we don't know for
systemd-timesyncd. So do not complicate the update by replacing it now.

Remove ntp replacement from udpate script and revert "ntp: Remove version 4.2.8p8"

This reverts commit 61313bf1498e5cbd5ec5f803af08294a59fe6ea7.
---
 ntp.be0                                  | 85 ++++++++++++++++++++++++
 scripts/update-systemd-from-27-to-238.sh |  3 +-
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100755 ntp.be0

diff --git a/ntp.be0 b/ntp.be0
new file mode 100755
index 000000000..9acee98dd
--- /dev/null
+++ b/ntp.be0
@@ -0,0 +1,85 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION ntp-4.2.8p8-0
+
+## this file was created by bee init and should be executed to build a
+## bee-package. (Additional hints are located at the end of this file.)
+
+###############################################################################
+## The source URL(s) define the location of the sources that will be
+## downloaded. Version variables may be used to simplify reuse of this bee-file.
+
+SRCURL[0]="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PKGVERSION[2]}/ntp-${PKGVERSION}.tar.gz"
+
+###############################################################################
+## Add URLs/pathes to patch files to the PATCHURL array.
+## The sources will be patched in the order of the array.
+
+# PATCHURL+=()
+
+###############################################################################
+## Add filename patterns to the EXCLUDE array of files that should not
+## be added to you package but may be present in the image directory.
+
+# EXCLUDE+=()
+
+###############################################################################
+## Uncomment the next statement, if the software may not be able to be build
+## outside the source directory and need to be build inside the source
+## directory.
+
+# build_in_sourcedir
+
+###############################################################################
+## bee cannot detect buildtypes specified in subdirectories.
+## Sometimes packages "hide" the real sources in a subdirectory named
+## 'src' or 'cmake' or ..
+## use 'sourcesubdir_append' to specify this directory if known.
+
+# sourcesubdir_append src
+
+
+###############################################################################
+## Change the default (auto-detected) steps to
+## extract, patch, configure/setup, build and install the software.
+## Make sure the mee_install function does install everything to the
+## image directory "${D}"
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+#mee_patch() {
+#    bee_patch "${@}"
+#}
+
+#mee_configure() {
+#    bee_configure
+#}
+
+#mee_build() {
+#    bee_build
+#}
+
+#mee_install() {
+#    bee_install
+#}
+## by default this may be 'make install DESTDIR="${D}"'
+
+###############################################################################
+##
+## Additional hints:
+##
+## The name of this bee-file should follow the following naming convention:
+##     pkgname-pkgversion-pkgrevision.bee
+##
+## You may remove all comments as long as SRCURL[0]="" is set.
+##
+## Everything in this file will be executed in a bash environment.
+##
+## Build the package by executing
+##     './pkg-version-N.bee' or
+##     'beesh ./pkg-version-N.bee'
+##
+## see http://beezinga.org/
+##
diff --git a/scripts/update-systemd-from-27-to-238.sh b/scripts/update-systemd-from-27-to-238.sh
index 33bfc7545..c46cc6cc6 100755
--- a/scripts/update-systemd-from-27-to-238.sh
+++ b/scripts/update-systemd-from-27-to-238.sh
@@ -28,8 +28,6 @@ sed -i 's/required       pam_systemd.so create-session=1 kill-user=0 kill-sessio
 
 echo "You can migrate to system-networkd."
 
-systemctl stop ntp
-systemctl disable ntp
 systemctl daemon-reload
 bee remove ntp-4.2.8p8-0.x86_64
 
@@ -43,3 +41,4 @@ ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf
 # just to be sure
 systemctl stop systemd-networkd
 systemctl disable systemd-networkd
+systemctl disable systemd-timesyncd