From bc35d9ddafabfc12abf97f9e1862bfce3f885ad9 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 13 Sep 2024 00:15:18 -0700 Subject: [PATCH] systemd/systemd-services: fix nftables unit (MR 5589) (MR 5563) The type was erroneously set as 'simple', and since we are setting ExecStop we actually need to set RemainAfterExit to avoid running ExecStop when the oneshot service runs. This is because nft returns/ exits pretty much immediately after applying the config. fixes #2846 --- extra-repos/systemd/systemd-services/APKBUILD | 4 ++-- extra-repos/systemd/systemd-services/system-nftables.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 58a356e2d..ad2e4f400 100644 --- a/extra-repos/systemd/systemd-services/APKBUILD +++ b/extra-repos/systemd/systemd-services/APKBUILD @@ -6,7 +6,7 @@ # How to add a new service file (5 steps): pkgname=systemd-services # 1. bump pkgver -pkgver=20 +pkgver=21 pkgrel=0 pkgdesc="Systemd service files" url="https://postmarketos.org" @@ -240,7 +240,7 @@ f6fb4c890cbf72e344ca7a22e7f033fb4c32ce9f5edc27c03ccc5c21424d6a0ef871d79e8a89a502 b0ecd5d413a2010d3f36285c2d35523119c29007e1e4162e51dfc746cc105f990a82a2a2d6037a8b906628c0a4f606729290525c7a53dbcfbc8147244fa403a7 user-kded.service 873b53592786a978659bda8d32de5ed9a9f163ca298c4f4112f10bf635a8170c4060cc15b57ff72b3afd50075cd1c5dbc10030f00b166e2540397da9e1c5e46b user-mmsd-tng.service 5eab6a59c81232b188df45482e325b2d1cb9e038ca147a1b6983c1c095d8194fba804793c5e291b201a820976c8f506aadd2daf7c52fe573a3af708fc9984641 system-ModemManager.service -d41d0aa1d4d577cd718185399c95055c0511d4aeb902c771ccec13655354aafc85c3f270431fd3debc7e05f0a8cbdb90f1969b673ae7e5310c1f46cb8120e3f2 system-nftables.service +12bb9aa2a2ab8d4b21c72a785b41057eb16a27eca5718cd03a987a50b77d669fe90abafae48c68b41616f31b1953853b3b4a74db4bc3cdeccacc00df113de204 system-nftables.service fa445c4a53214524baed4e9c52a5463592a074f88a5a286eacb60d0907c0545f725afde23abd68cf611067add80c2ccb289a381fc5ff6a5f654ea49c81f02fe8 system-sshd.service c0badea3905c1d53d213fbfe11d25b556a2e484fe77eb50e9f4d42e25b67b56a0804e7d8e1b7731cd280cbb3525b4c60311817609381e2308d9f2dfb7c0d7072 system-sshdgenkeys.service 0bed9a8a719661609ad84d1c6fcdf2fe9213e741682b7ddebad82d9744f137c593788ed522868f10b95b599d81743d07ec3212630a7e99d333261dfa1bf1cc11 system-pd-mapper.service diff --git a/extra-repos/systemd/systemd-services/system-nftables.service b/extra-repos/systemd/systemd-services/system-nftables.service index f0bd722d0..41e7122f8 100644 --- a/extra-repos/systemd/systemd-services/system-nftables.service +++ b/extra-repos/systemd/systemd-services/system-nftables.service @@ -8,7 +8,7 @@ Type=oneshot ExecStart=/usr/sbin/nft -f "/etc/nftables.nft" ExecReload=/usr/sbin/nft -f "/etc/nftables.nft" ExecStop=/usr/sbin/nft flush ruleset -Type=simple +RemainAfterExit=yes [Install] WantedBy=multi-user.target