forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

postmarketos-base: disable openrc syslog service (MR 4617)

Browse source 
Ensure that we don't have two logging daemons running!

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
This commit is contained in:
Caleb Connolly 2023-12-10 18:00:13 +00:00
parent fe4141c113
commit 7efcec020d
No known key found for this signature in database
GPG key ID: 7930459FB9303217
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/postmarketos-base/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=postmarketos-base
pkgver=31
pkgrel=0
pkgrel=1
pkgdesc="Meta package for minimal postmarketOS base"
url="https://postmarketos.org"
arch="noarch"

20
main/postmarketos-base/postmarketos-base.post-upgrade
View file

@ -5,15 +5,23 @@
# service! (build.postmarketos.org#85)
# The old version of the package is passed in as the second argument
OLD_VER="$(echo $2 | cut -d "-" -f 1)"
OLD_VER="$2"
NEW_VER="$1"
old_ver_less() {
[ "$OLD_VER" != "$1" -a "$(echo -e "$1\n$OLD_VER" | sort -V | head -n1)" = "$OLD_VER" ]
}
# postmarketos-base version 30 moves us from openrc-syslog to logbookd
# so enable the logbookd service if we're upgrading from an older version.
# If we're upgrading from a newer version, then we're already using logbookd
# and the user may have disabled the service, so don't re-enable it.
if [ $OLD_VER -lt 30 ]; then
# postmarketos-base version 30 moved us to logbookd but we forgot to disable
# syslog... The easiest way to solve this is to just do the upgrade again, sorry
# to anyone who manually disabled logbookd again...
if old_ver_less "31-r1"; then
echo "## postmarketos-base migrating to logbookd ##"
echo "## The initial upgrade didn't disable syslog, we're doing that now ##"
echo "## If you want to keep using syslog, undo the following changes ##"
set -x
rc-update add logbookd boot
rc-update del syslog boot
set +x
fi
# Fixup old pmOS installations that run setup-timezone without "-i" option