diff options
author | Thomas Liske <thomas@fiasko-nw.net> | 2018-08-30 18:54:22 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-09-21 10:32:29 +0300 |
commit | dc5bc1b4706dac45b06808a89d96e126341cdfba (patch) | |
tree | 55d07e0e459aa55a57462a3c747f1d86b45dcf4d | |
parent | 41b4f2fefdc60865e8d4d1e5f7417a93cbf988dd (diff) |
main/ipset: fix reloading of existing ipsets
-rw-r--r-- | main/ipset/APKBUILD | 4 | ||||
-rw-r--r-- | main/ipset/ipset.initd | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD index 990394e66cd..18220343cd7 100644 --- a/main/ipset/APKBUILD +++ b/main/ipset/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=ipset pkgver=6.34 -pkgrel=0 +pkgrel=1 pkgdesc="Manage Linux IP sets" url="http://ipset.netfilter.org/" arch="all" @@ -36,4 +36,4 @@ package() { sha512sums="5a8cd743eee5abdbaba452c3b4508e9f0569a5a5ae83c9aeafb3d92c2c17672b489302a4a0953668c8b6d51cf7e510660b03b9dbd4ccb2deddffa41e6e6db33a ipset-6.34.tar.bz2 7bc9f2bc8d0e15722913373317422ad74fc9504ea01aacd6d512ac337cc166bbb5a0ae77e086277df6eb1e433154b37adf596680db2f43f6656a41f6876a61f0 musl-fix.patch -d8a85dd7796fcab7d8894eb763d82af91d7abebd7f6a1f1d6d90c8297c8fda141821cf230ade2d9f554ddd0122ab10e18823722f112f0b9de6f4bd097590ca51 ipset.initd" +c7d3344ce879ff3b21f9e30a00d49a41cbd68172aec1a933a4b501dded54e3c57615386850901da22c652a34bcbe39caac86a3a0447da24bae29b40632153239 ipset.initd" diff --git a/main/ipset/ipset.initd b/main/ipset/ipset.initd index 649b310ac5f..83cfee920fa 100644 --- a/main/ipset/ipset.initd +++ b/main/ipset/ipset.initd @@ -87,10 +87,15 @@ reload() { local swap= for name in $(set_files); do + if set_exists $name; then + swap="$swap $name" + fi + done + + for name in $(set_files); do local new=$name if set_exists $name; then new=_init_$name - swap="$swap $name" fi echo create $new $(set_file $name | head -n 1) done | ipset restore |