From a90267f76887853f51be2728f8f6acbb6894f8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6chst?= <git@jonashoechst.de>
Date: Tue, 30 Apr 2024 17:08:52 +0200
Subject: [PATCH] reimplemented chrony-waitsync (fixes boot issues)

---
 .github/workflows/build.yml                | 28 ----------------------
 etc/systemd/system/chrony-waitsync.service | 11 +++++++++
 tsOS-Base.Pifile                           |  4 ++--
 3 files changed, 13 insertions(+), 30 deletions(-)
 create mode 100644 etc/systemd/system/chrony-waitsync.service

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e161d78..1eb3c8c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,31 +39,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: gh release upload ${{github.ref_name}} tsOS-Base-arm64-${{github.ref_name}}.zip
-
-  build-armhf:
-    runs-on: ubuntu-latest
-    needs: release
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
-        with:
-          submodules: recursive
-          token: ${{ secrets.PAT_JONASHOECHST }}
-
-      - name: Run tsOS-Base-armhf.Pifile
-        uses: Nature40/pimod@v0.6.0
-        with:
-          pifile: tsOS-Base-armhf.Pifile
-
-      - name: Package tsOS-Base-armhf-${{github.ref_name}}.zip
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          mv tsOS-Base-armhf.img tsOS-Base-armhf-${{github.ref_name}}.img
-          zip tsOS-Base-armhf-${{github.ref_name}}.zip tsOS-Base-armhf-${{github.ref_name}}.img
-
-      - name: Upload Release tsOS-Base-armhf-${{github.ref_name}}.zip
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${{github.ref_name}} tsOS-Base-armhf-${{github.ref_name}}.zip
-
diff --git a/etc/systemd/system/chrony-waitsync.service b/etc/systemd/system/chrony-waitsync.service
new file mode 100644
index 0000000..2a71b09
--- /dev/null
+++ b/etc/systemd/system/chrony-waitsync.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Wait until chrony timesync and notify systemd.
+After=chrony.service
+
+[Service]
+ExecStart=/bin/bash -c 'chronyc waitsync && (mkdir -p /run/systemd/timesync/; touch /run/systemd/timesync/synchronized)'
+Type=oneshot
+StandardOutput=journal
+
+[Install]
+RequiredBy=multi-user.target
diff --git a/tsOS-Base.Pifile b/tsOS-Base.Pifile
index 435bf34..6bc8601 100644
--- a/tsOS-Base.Pifile
+++ b/tsOS-Base.Pifile
@@ -3,7 +3,7 @@
 
 FROM https://downloads.raspberrypi.com/raspios_lite_${ARCH}/images/raspios_lite_${ARCH}-2023-12-11/2023-12-11-raspios-bookworm-${ARCH}-lite.img.xz
 TO "tsOS-Base-${ARCH}.img"
-PUMP 1800M
+PUMP 1200M
 
 #################################################
 ### install software
@@ -139,7 +139,7 @@ RUN git config --global user.name "tsOS User"
 RUN systemctl enable hostname-config.service
 
 # Enabling wait for time-sync.target (depending services will not start before the clock is synced)
-RUN systemctl enable systemd-time-wait-sync-prepare.service systemd-time-wait-sync.service
+RUN systemctl enable chrony-waitsync.service systemd-time-wait-sync-prepare.service systemd-time-wait-sync.service
 
 # Reboot on kernel panic
 RUN bash -c "echo kernel.panic=10 | tee -a /etc/sysctl.conf"