Skip to content
Snippets Groups Projects
Unverified Commit 6d36f894 authored by Clayton Craft's avatar Clayton Craft :speech_balloon:
Browse files

systemd/systemd: fix default disable preset (MR 5588)

This didn't actually seem to do anything, resulting in some weird stuff
being enabled by default even though we did not specify a preset for it
(e.g. see !5556)

Based on my interpretation of the systemd preset manpage, this file
should be parsed last. It says that if a unit name has a preset that
was already configured in some previously parsed preset file, then any
matches after do not apply. This means that the `disable *` should not
disable any previously enabled (in previous .preset files) units. When
the unit name is omitted from the `disable` command, it seems to be a no-op.

Fixes !5207
parent bd6971f0
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@
pkgname=systemd
pkgver=256
_pkgver="musl-v${pkgver//_/-}"
pkgrel=3
pkgrel=4
pkgdesc="System and service manager"
url="https://github.com/systemd/systemd"
arch="all !ppc64le !armhf !s390x" # blocked by pmboostrap not supporting
......@@ -218,7 +218,7 @@ package() {
# ship default policy to leave services disabled
mkdir -p "$pkgdir"/usr/lib/systemd/system-preset
echo 'disable' > "$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
install -Dm755 "$srcdir"/systemd-apk-macros.sh -t \
"$pkgdir"/usr/lib/systemd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment