From 60778a8e8234bcdb3dfc70f693acfb42958faab7 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 22 Apr 2025 21:25:20 -0700 Subject: [PATCH] systemd/systemd-services: remove zram-init -s param from zram_swap.service This causes zram-init to write to a device attr that was dropped from the 6.15 kernel, and fail: https://github.com/torvalds/linux/commit/4127e13c9302f6892f73793f133ea4b4fffb2964 Reported upstream: https://github.com/vaeth/zram-init/issues/50 fixes #3677 Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6443 [ci:skip-build]: already built successfully in CI --- extra-repos/systemd/systemd-services/APKBUILD | 4 ++-- extra-repos/systemd/systemd-services/system-zram_swap.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD index b84dd05e5..0a3729c40 100644 --- a/extra-repos/systemd/systemd-services/APKBUILD +++ b/extra-repos/systemd/systemd-services/APKBUILD @@ -7,7 +7,7 @@ # How to add a new service file (5 steps): pkgname=systemd-services # 1. bump pkgver -pkgver=64 +pkgver=65 pkgrel=0 pkgdesc="Systemd service files" url="https://postmarketos.org" @@ -407,5 +407,5 @@ e09a3c76f3be961dce9f564bb654ea84d1d7fb59907a2168c0569bf6c17a5ebe9fbe4d1f94f1d014 9dd95f10dcdb6234697b012c6f428cfca0cfbde24a8951e96cb4c463f55a22d40096a94ca0018f9dbe4ebb2c80eb39faeaa9222f6fb419831520a138f88f0321 user-xdg-document-portal.service 1262f10b97989be726432700a923d7717570feb7b0d78c3c573e21ee6be320f5a618d0d21c1eb351702397caa95b476b8854bf83545993fb464b4a7a80067800 user-xdg-permission-store.service 744c60fdc6e53ba2c9f370ce8462e1a420cfea973edff49d0caf7a3e65f0f35257d61b5ae3ace3e9d9d48e382cb54d9f2ff96ad02d5e16758a49ba2e07963e5a user-xdg-desktop-portal-wlr.service -9b8593ed3ff6b5427ea31388c2761f769968c102f9e5d696510c77dbbc3c56c56e465fb0d7765ec9d2fed7455882a0a33477c1545b3932e6fea7958a2328e540 system-zram_swap.service +fff8744d8597fa10dc8832814b3a3188c64915ff205a4a0eb8adfcc83c85edc24887039c31d6cdb3bdf5d6f7da36d2e08795e4c1624d751654bd06c3d45de67f system-zram_swap.service " diff --git a/extra-repos/systemd/systemd-services/system-zram_swap.service b/extra-repos/systemd/systemd-services/system-zram_swap.service index b2d4198de..1f2fa18e2 100644 --- a/extra-repos/systemd/systemd-services/system-zram_swap.service +++ b/extra-repos/systemd/systemd-services/system-zram_swap.service @@ -16,7 +16,7 @@ RemainAfterExit=true # num_devices in modprobe.d/zram.conf contains the maximal used number + 1 ExecStartPre=-/sbin/modprobe zram -ExecStart=/bin/sh -c "exec /usr/sbin/zram-init -s2 -azstd -Lzram_swap `zram-size-calc`" +ExecStart=/bin/sh -c "exec /usr/sbin/zram-init -azstd -Lzram_swap `zram-size-calc`" ExecStop=/usr/sbin/zram-init 0 [Install]