Skip to content
Snippets Groups Projects
Unverified Commit 5fa66640 authored by Clayton Craft's avatar Clayton Craft :speech_balloon: Committed by Oliver Smith
Browse files

extra-repos/systemd: fix deinstall macro (MR 5746) (MR 5563)

This wasn't actually working because it was using an unset var when
calling 'systemctl disable'.

[ci:skip-build]: CI cannot complete build testing because of infra
issue, but that's fine because this change doens't actually require
compiling systemd.
parent aa7f9531
Branches
No related tags found
1 merge request!5563Add systemd to pmOS edge
......@@ -5,7 +5,7 @@
pkgname=systemd
pkgver=256.5
_pkgver="musl-v${pkgver//_/-}"
pkgrel=2
pkgrel=3
pkgdesc="System and service manager"
url="https://github.com/systemd/systemd"
arch="all !ppc64le !armhf !s390x" # blocked by pmboostrap not supporting
......@@ -430,6 +430,6 @@ dev() {
sha512sums="
5d1f4625b75b6637afa71519bc7048fe899b4f5785ce26316524ac78941e43cf6ba83391dae68497cfa4f8aaa35d953ec0c04ee581307ffc7007cf4b9d9c4454 systemd-musl-v256.5.tar.gz
e8ced12eb67a261a5c2788487053451c352e0b2ebe3d72aaf84a3011dc92981affe4f036f693260fc8ee4a49f02de4522fd022e5783dba939023f13891ab228e 4.patch
73d10e72413c6b688c847c667ccb42ef1f273d498e4b4ff5344dc98432e05aab92bbcd42725935b15f3ebcc627729318ac592c3372cf22465f39ea93a5dedc8b systemd-apk-macros.sh
2f9ec875de67fc4bb401bebea88653cd34c22787a26a8122233fbb761bfbf190be72cfa0c26a433c30d703ee1e10489787d75492f0e1a76cbd5f6601e7e23d49 systemd-apk-macros.sh
81c897fed8a3fbfb67ec591b2398a5d65e4af1b3ef379376c157c98d71f085b707f8ebc896d5571a94f99f8fc84fd6b43e3b879ca9b0d57fc6c4596034c7a777 wired.network
"
......@@ -76,9 +76,9 @@ systemd_service_pre_deinstall() {
;;
"system")
if is_systemd_running; then
systemctl --no-reload disable --now --no-warn $system_preset
systemctl --no-reload disable --now --no-warn "$@"
else
systemctl --no-reload disable --no-warn $system_preset
systemctl --no-reload disable --no-warn "$@"
fi
;;
*)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment