From 28debb753030dd48ad2181c066174f8ce206a344 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 25 Dec 2025 19:07:53 -0500 Subject: [PATCH] device-pine64-pinenote: fix chroot install `device-pine64-pinenote-systemd.post-install` checks if `tinydm-ebc` was active via `is-active` systemctl command. This does not work in chroot environment, and exits with exit code 0, thus acting as if `tinydm-ebc` is active. Since this check is used for v7-r0 to v8-r0 upgrade, it can be assumed that if output isn't `active`, then the check should not pass. This commit reworks this by looking for that output rather than a zero exit code. Part-of: --- device/testing/device-pine64-pinenote/APKBUILD | 2 +- .../device-pine64-pinenote-systemd.post-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device/testing/device-pine64-pinenote/APKBUILD b/device/testing/device-pine64-pinenote/APKBUILD index 21ffbb390..f6f1afdfb 100644 --- a/device/testing/device-pine64-pinenote/APKBUILD +++ b/device/testing/device-pine64-pinenote/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-pine64-pinenote pkgdesc="Pine64 PineNote" pkgver=8 -pkgrel=0 +pkgrel=1 _commit="28d2c05ab4e80a7972611cd3188f3e8be4197f6a" url="https://postmarketos.org" license="GPL-3.0-only" diff --git a/device/testing/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install b/device/testing/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install index 24a8b7072..5c14f2988 100644 --- a/device/testing/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install +++ b/device/testing/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install @@ -4,7 +4,7 @@ # allow seamless upgrade 7-r0 to 8-r0, as tinydm-ebc was removed # in favor of a systemd override for tinydm # TODO: remove in preparation for v26.06 -if systemctl is-active -q tinydm-ebc.service 2>/dev/null; then +if [ "$(systemctl is-active tinydm-ebc.service 2>/dev/null )" == "active" ]; then systemctl disable tinydm-ebc.service systemctl enable tinydm.service fi