From a800cc6898641008a49a9d20b7aa91fe4bc28f81 Mon Sep 17 00:00:00 2001 From: Clayton Craft <clayton@craftyguy.net> Date: Wed, 4 Sep 2024 16:21:12 -0700 Subject: [PATCH] systemd/pmos-base-systemd: disable multipathd by default (MR 5556) This causes systemd to get stuck restarting multipathd forever on boot if it runs on systems with no multipath hardware. When this happens, the system never finishes booting. It doesn't seem like any UIs/devices enable the multipathd service by default in openrc, and that we just depend on multipath-tools for kpartx and stuff (and not the daemon that comes with it) [ci:skip-build] already built successfully in CI --- extra-repos/systemd/postmarketos-base-systemd/APKBUILD | 4 ++-- .../rootfs-usr-lib-systemd-system-preset-90-base.preset | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD index 011d18ea16a..f89d774b183 100644 --- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD +++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith <ollipearanoid@postmarketos.org> # pmbootstrap installs this, if systemd is selected in "pmbootstrap init". pkgname=postmarketos-base-systemd -pkgver=2 +pkgver=3 pkgrel=0 pkgdesc="Meta package for running postmarketOS with systemd" url="https://postmarketos.org" @@ -61,7 +61,7 @@ fbaa33425e507062a454f11bda48508f261c2144e5c23a20f567dc1cef14ce1dec57f8d934f418f5 2faac294bb632762e247b850f09ff4b544ccff6c462efd8d4faca71ba30bdfa9c460377a0dc88e92c5dbbe251017d164064a56ac0e0410f224b45d4f5f81866c rootfs-etc-systemd-logind.conf 208f53c1d142151277cfcf0a95df839919ce8cb15ec888d50890dc6b3631a994335bfa12194cec856b649f97cfd7c80019c595cc0ea2c5ee96498a3e76a9950b rootfs-etc-ssh-sshd_config.d-usepam.conf 15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1 rootfs-usr-share-mkinitfs-files-01-initramfs-base-systemd.files -bbe88651237a65a5cf0976b59aa6885f53d78b265272c116732fd13ead6914c0525f7c7860fccd6c2933fd648ad6d5a4820de481e6913d1f233c4f52cfcd1dc6 rootfs-usr-lib-systemd-system-preset-90-base.preset +449d7cd5bc334e73da950bf9ce68b026b9e7db180a5a48d0cb10bb486e5af16b68c146c1bd61e291419ae6e679f6613ad81a17b9a75d2a5218a355cd7f6a32da rootfs-usr-lib-systemd-system-preset-90-base.preset 9b3b9abdb3d3541038d37d6870baed81f20be7f5b80874bd142eeb686b08958180b4d4a293912c9760e4353a58d6a5dea43e155002f224d14a157f7a082cde60 rootfs-usr-lib-systemd-user-preset-90-base.preset 605df1f004783d2e0ec5dd99a688bca27502c8c24bc05fb4dc26589b2070b0fbd1cf9bd56e6861d7cda2f8ac8147e7eb040acfd886185c01c8cf9de8b1ce2dcd rootfs-usr-bin-setup-timezone " diff --git a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset index ba9046d5117..9a75db5c2de 100644 --- a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset +++ b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset @@ -2,6 +2,10 @@ disable systemd-network* disable systemd-homed* +# starting multipathd on systems with no multipath hardware can soft-hang +# boot, so disable it by default +disable multipathd.service + # for basically all Uis ## system services enable apk-polkit-server.service -- GitLab