Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

systemd/postmarketos-base-systemd: add missing preset config

Browse source 
The trigger runs `systemctl preset cups.service`, but then if it runs
preset on the other two *afterwards* it will disable them (because no
explicit preset and we default to disable). This helps ensure they're
kept enabled.

The same seems to also happen for NetworkManager-wait-online and the
other things here, leading to them being accidentally disabled.

This also removes cups.service, it should be socket-activatable now that
cups.socket is enabled.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7029>
This commit is contained in:
Clayton Craft 2025-09-10 14:46:15 -07:00 • committed by The Friendly Merge Bot
parent 44204bed8d
commit 4f29f7a07e
No known key found for this signature in database
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extra-repos/systemd/postmarketos-base-systemd/APKBUILD
View file

@ -2,7 +2,7 @@
# Co-maintainer: Clayton Craft <clayton@craftyguy.net>
# pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
pkgname=postmarketos-base-systemd
pkgver=54
pkgver=55
pkgrel=0
pkgdesc="Meta package for running postmarketOS with systemd"
url="https://postmarketos.org"
@ -105,9 +105,9 @@ sha512sums="
2faac294bb632762e247b850f09ff4b544ccff6c462efd8d4faca71ba30bdfa9c460377a0dc88e92c5dbbe251017d164064a56ac0e0410f224b45d4f5f81866c rootfs-etc-systemd-logind.conf
15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1 rootfs-usr-share-mkinitfs-files-extra-01-initramfs-base-systemd.files
94063e3a3f983b7613d9de6bfc067096f79b12688f45667faf968f9a9bae194c4c8e554311f2ab5614edcc4d4499f6d30aa965a67b7417c26ce4d07edc847178 rootfs-usr-lib-NetworkManager-conf.d-50-dns.conf
4fcedc2d7a947de893235ca77e074d24df9561e12b72029d6902db6e7d8321ee3dbcfbfc12f153727c3b8972e6f5871a07e15127c83524177507f5f0f70b7b8f rootfs-usr-lib-systemd-system-preset-90-base.preset
529fba82f6ab582b74a7c145382c186eaf2ff3fdf6a2e605b0135d1990eb13aee79c4fec6a32aa44f16ea832eabbc0a005ebb8bebdb81eaabe4e8061398a5479 rootfs-usr-lib-systemd-system-preset-90-base.preset
1458d526e3d68c052126f648a33c3f22af10e3a4d479dded824c2b18b2022b43232ea6f8c2061f051927b2d612750017a2ecf7e1a19680b71ca2dc112d5bd3f6 rootfs-usr-lib-systemd-system-system.slice.d-10-oomd-defaults.conf
d223a7b6ec457190df7578a692d45cd4bc061d441c10d2f57980a2cd3f9204233e5ecd6ff966a93901e4d3c72c4e81409dd4e2781b9aa08dffbf2fb2579e4dd6 rootfs-usr-lib-systemd-user-preset-90-base.preset
86dd78299b58a8c577c39770ef72f6d2899a0db02b1af0adbc16f53599305aa1017ab82facdd60c17c2412f948d06ce7a6c431f8c2f3330b7c5f3d563c98375d rootfs-usr-lib-systemd-user-preset-90-base.preset
1458d526e3d68c052126f648a33c3f22af10e3a4d479dded824c2b18b2022b43232ea6f8c2061f051927b2d612750017a2ecf7e1a19680b71ca2dc112d5bd3f6 rootfs-usr-lib-systemd-user-slice.d-10-oomd-defaults.conf
e49972d276441e9da284315bab5f70d8d25ccba5e43d7e7ec6607c34a3d4dfa512f7303d5ce41076819ef24f5dced5acc74001b4d569258269de34da27912466 rootfs-usr-lib-systemd-resolved.conf.d-disable-dnsovertls.conf
93ab180810dbd2a1477f7ea0f0959be90f099272fe5840030a0772771c97a066b70068c476d32c6a4610b8f7b9fc5bfcf1d7a93f071cec026553ac6a3b8b5324 rootfs-usr-lib-systemd-resolved.conf.d-disable-mdns.conf

4
extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
View file

@ -11,6 +11,7 @@ disable multipathd.service
## system services
enable ModemManager.service
enable NetworkManager.service
enable NetworkManager-wait-online.service
enable apk-polkit-server.service
enable bluetooth.service
enable haveged.service
@ -24,7 +25,8 @@ enable sshd.service
enable systemd-rfkill.service
enable tinydm.service
enable udisks2.service
enable cups.service
enable cups.path
enable cups.socket
enable zram_swap.service
enable systemd-oomd.service
enable alsa-restore.service

3
extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-preset-90-base.preset
View file

@ -11,8 +11,11 @@ enable fbd-alert-slider.service
enable vvmd.service
enable mmsd-tng.service
enable udiskie.service
enable xdg-desktop-portal-rewrite-launchers.service
enable systemd-tmpfiles-clean.timer
# GNOME
enable gnome-keyring-daemon.service
enable gnome-keyring-daemon.socket
# xfce4