From 37e1370ae9f999254f4e9ccc7e90276c1fd0f3b8 Mon Sep 17 00:00:00 2001
From: Clayton Craft <craftyguy@postmarketos.org>
Date: Fri, 10 Jul 2026 07:44:56 -0700
Subject: [PATCH] systemd/postmarketos-base-systemd: don't enable
 time-wait-sync

This removes the other half of the workaround for #3816, that should have been in !8487.

Fixes #4687

This reverts commit 5e435f966947786607f4a1c1b68cd6c63b249765.

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8993>
---
 extra-repos/systemd/postmarketos-base-systemd/APKBUILD        | 4 ++--
 .../rootfs-usr-lib-systemd-system-preset-90-base.preset       | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
index ee7327eda..a8aa4da80 100644
--- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
+++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
@@ -1,7 +1,7 @@
 # pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-base-systemd
-pkgver=82
+pkgver=83
 pkgrel=0
 pkgdesc="Meta package for running postmarketOS with systemd"
 url="https://postmarketos.org"
@@ -118,7 +118,7 @@ b7c3e70f5e4d88d6df6a8d58f4bb6af3d3051c5130cf13ad86a491fcbf7a69ae33ba31d663946c35
 bd85f6153d857e1aec191b5fc8c8fc0d87125bf0198bef20d1e91ef40ca7e9ed1209a64ae279f98dc8733969ad6e71e29623180ef2203e386023a950d9ce8269  rootfs-usr-lib-systemd-logind.conf
 e49972d276441e9da284315bab5f70d8d25ccba5e43d7e7ec6607c34a3d4dfa512f7303d5ce41076819ef24f5dced5acc74001b4d569258269de34da27912466  rootfs-usr-lib-systemd-resolved.conf.d-disable-dnsovertls.conf
 93ab180810dbd2a1477f7ea0f0959be90f099272fe5840030a0772771c97a066b70068c476d32c6a4610b8f7b9fc5bfcf1d7a93f071cec026553ac6a3b8b5324  rootfs-usr-lib-systemd-resolved.conf.d-disable-mdns.conf
-364bbe9e3905a8c6d3cbcc7ee4ed3fb8a5d9c86ee106987bcb6e5b0edf4693e417885530aa56e67749438b17addb6824389a90ce1d8b3d0ce9d93447479816d7  rootfs-usr-lib-systemd-system-preset-90-base.preset
+80e78209a028618f34eaf2e22fc95eb4f6b3d2fe04987fd43be997f3fd6404db3624b4fd7b79dbad48df391fb215ccd11ed2dd6d145e3edc49388333c0dbe746  rootfs-usr-lib-systemd-system-preset-90-base.preset
 bde7052939d1ddde22fe1df86439d3f1b0cd41810911cee7acf26aac08afe1610360cbbd257b3c1a2e5e7409dff27ade8f3a302a38cd1b99c6cc6eed4cc64a78  rootfs-usr-lib-systemd-system--.slice.d-10-oomd-defaults.conf
 bde7052939d1ddde22fe1df86439d3f1b0cd41810911cee7acf26aac08afe1610360cbbd257b3c1a2e5e7409dff27ade8f3a302a38cd1b99c6cc6eed4cc64a78  rootfs-usr-lib-systemd-system-system.slice.d-10-oomd-defaults.conf
 cedd159b98ce47ee9d03e5f332c4132c7c3eff32135aa7b7993e19c4867d55aff689b418fc549e139c0ea4690f1094e86efcee7a5bc6cd6998ba99821064a917  rootfs-usr-lib-systemd-system-tmp.mount.d-10-min-memory.conf
diff --git a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
index c4f224a72..2d6a59447 100644
--- a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
+++ b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
@@ -2,7 +2,6 @@
 disable systemd-network*
 disable systemd-homed*
 disable systemd-journald-audit.socket
-enable systemd-time-wait-sync.service
 
 # starting multipathd on systems with no multipath hardware can soft-hang
 # boot, so disable it by default