diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-06-30 09:18:17 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-06-30 09:39:16 +0200 |
| commit | 47fd8517c3d1af028f7caf8ba09fc9147f57fe3d (patch) | |
| tree | 22162e0aacb9e7bad204060bc29d2476cedaffd0 /net-misc/miniupnpd | |
| parent | net-misc/miniupnpd: Lower iptables dep to 'use' in init.d (diff) | |
| download | gentoo-47fd8517c3d1af028f7caf8ba09fc9147f57fe3d.tar.gz gentoo-47fd8517c3d1af028f7caf8ba09fc9147f57fe3d.tar.bz2 gentoo-47fd8517c3d1af028f7caf8ba09fc9147f57fe3d.zip | |
net-misc/miniupnpd: Invert boolean for calling iptables
The negative logic is confusing, and it would get even more confusing
with the incoming ip6tables and nftables support.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'net-misc/miniupnpd')
| -rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-conf.d-r2 | 10 | ||||
| -rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-init.d-r2 | 4 | ||||
| -rw-r--r-- | net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 new file mode 100644 index 000000000000..2ebd8c56b57e --- /dev/null +++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 @@ -0,0 +1,10 @@ +# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script + +# extra arguments to be passed to the command +#extra_args="" + +# the location of the configuration file +#config_file="/etc/miniupnpd/miniupnpd.conf" + +# enable manipulating iptables on start/stop +iptables_scripts=1 diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r2 b/net-misc/miniupnpd/files/miniupnpd-init.d-r2 index 2f9dc5fe6f3c..8b9f0579f223 100644 --- a/net-misc/miniupnpd/files/miniupnpd-init.d-r2 +++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r2 @@ -15,7 +15,7 @@ depend() { start_pre() { local retval=0 - if [ -z "${no_iptables_scripts}" ]; then + if [ -n "${iptables_scripts}" ]; then /etc/miniupnpd/iptables_init.sh || retval=${?} fi @@ -25,7 +25,7 @@ start_pre() { stop_post() { local retval=0 - if [ -z "${no_iptables_scripts}" ]; then + if [ -n "${iptables_scripts}" ]; then /etc/miniupnpd/iptables_removeall.sh fi diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild index 0e787f99f32d..30de1d75b8f0 100644 --- a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild @@ -56,7 +56,7 @@ src_install() { emake PREFIX="${ED}" STRIP=true install newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} - newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN} + newconfd "${FILESDIR}"/${PN}-conf.d-r2 ${PN} } pkg_postinst() { |