From a71ae2dadc449fbb43ed550670e9c989f66069bd Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Nov 23 2024 08:03:31 +0000 Subject: Link asahi-enable-zswap.conf instead of copying it This makes it easier to tweak the config in the future if we need to --- diff --git a/fedora-asahi-remix-scripts.spec b/fedora-asahi-remix-scripts.spec index 2ff586a..059623b 100644 --- a/fedora-asahi-remix-scripts.spec +++ b/fedora-asahi-remix-scripts.spec @@ -1,6 +1,6 @@ Name: fedora-asahi-remix-scripts Version: 20241123 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fedora Asahi Remix utility scripts License: MIT @@ -34,7 +34,7 @@ install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} install-extras.sh install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} setup-swap.sh install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} fixup-branding-packages.sh install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} check-network-online.sh -install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} asahi-enable-zswap.conf +install -Dpm0755 -t %{buildroot}%{_datadir}/%{name} asahi-enable-zswap.conf %post %systemd_post asahi-extras-firstboot.service @@ -50,7 +50,7 @@ if [ $1 -gt 1 ] && grep -q '^/var/swap/swapfile' /etc/fstab && [ ! -e /etc/systemd/zram-generator.conf ] && [ ! -e /etc/tmpfiles.d/asahi-enable-zswap.conf ]; then echo "# disable zram-generator-defaults config in favor of zswap on Apple systems with swap" >/etc/systemd/zram-generator.conf - cp %{_libexecdir}/%{name}/asahi-enable-zswap.conf /etc/tmpfiles.d/ + ln -s %{_datadir}/%{name}/asahi-enable-zswap.conf /etc/tmpfiles.d/ fi %preun @@ -71,8 +71,12 @@ fi %{_unitdir}/asahi-branding-fixup.timer %{_udevhwdbdir}/65-autosuspend-override-asahi.hwdb %{_libexecdir}/%{name}/ +%{_datadir}/%{name}/ %changelog +* Sat Nov 23 2024 Hector Martin - 20241123-3 +- Link asahi-enable-zswap.conf instead of copying it + * Fri Nov 22 2024 Hector Martin - 20241123-1 - Switch out zram for zswap on swapful systems diff --git a/setup-swap.sh b/setup-swap.sh index ec5d289..7cf9059 100755 --- a/setup-swap.sh +++ b/setup-swap.sh @@ -48,7 +48,7 @@ echo "# disable zram-generator-defaults config in favor of zswap on Apple system systemctl stop systemd-zram-setup@zram0.service || true # Enable zswap -cp asahi-enable-zswap.conf /etc/tmpfiles.d/ +ln -sf /usr/share/fedora-asahi-remix-scripts/asahi-enable-zswap.conf /etc/tmpfiles.d/ systemd-tmpfiles --create /etc/tmpfiles.d/asahi-enable-zswap.conf # If we got this far, disable it for good measure (even though it should not run again)