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:36:28 +0300 |
| commit | b921d5dd4d8e686dc40080e409e11c6a74dbf337 (patch) | |
| tree | f6d2060082075f8adb3008f3a2396491d32f440f /main | |
| parent | adb2a2ada250b5756ac84b9f8ccbef204cc545f4 (diff) | |
main/ipset: fix reloading of existing ipsets
Diffstat (limited to 'main')
| -rw-r--r-- | main/ipset/APKBUILD | 8 | ||||
| -rw-r--r-- | main/ipset/ipset.initd | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD index e7833eeb615..6aaadf6ac75 100644 --- a/main/ipset/APKBUILD +++ b/main/ipset/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=ipset pkgver=6.29 -pkgrel=0 +pkgrel=1 pkgdesc="Manage Linux IP sets" url=http://ipset.netfilter.org/ arch="all" @@ -44,9 +44,5 @@ package() { install -m 755 "$startdir/ipset.initd" "$pkgdir/etc/init.d/ipset" } -md5sums="fd8ea35997115c5c630eee22f0beecec ipset-6.29.tar.bz2 -5879eb9ff65f102003376634f60c578f ipset.initd" -sha256sums="6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e ipset-6.29.tar.bz2 -90822d788ef4b1d04bcf5130ac5b97bbfd044a62be35360289ec1252c590a3c1 ipset.initd" sha512sums="ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3 ipset-6.29.tar.bz2 -73993eb882371f5ef605762c96ad33625b99680aa38c823ed908dfc43b1fa86eb7714fe3b6e4cd5547b7b0a9b1f4209d2541d60341548fcbbfa95244471cfc93 ipset.initd" +671ca99d4e9b49b44564aa0b8f8e4c2509ddd5b0c55a8678580080825831c017793ba5c0dbb336c75f4ba045b17b1dd1c163818c44748e6b7972b7d607aa188e ipset.initd" diff --git a/main/ipset/ipset.initd b/main/ipset/ipset.initd index 84b17c2aba8..a2014bf9c7e 100644 --- a/main/ipset/ipset.initd +++ b/main/ipset/ipset.initd @@ -83,10 +83,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 ipset create $new $(set_file $name | head -n 1) done |