Merge pull request #12564 from ehrmann/patch-1

miniupnpd: suppress grep and uci errors
This commit is contained in:
Rosen Penev 2020-06-21 13:10:42 -07:00 committed by GitHub
commit ded3f39737
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd PKG_NAME:=miniupnpd
PKG_VERSION:=2.1.20191006 PKG_VERSION:=2.1.20191006
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

View file

@ -12,9 +12,9 @@
[ "$ACTION" != "ifup" ] && procd_running "miniupnpd" "*" && exit 0 [ "$ACTION" != "ifup" ] && procd_running "miniupnpd" "*" && exit 0
tmpconf="/var/etc/miniupnpd.conf" tmpconf="/var/etc/miniupnpd.conf"
external_iface=$(uci get upnpd.config.external_iface) external_iface=$(uci -q get upnpd.config.external_iface)
external_iface6=$(uci get upnpd.config.external_iface6) external_iface6=$(uci -q get upnpd.config.external_iface6)
external_zone=$(uci get upnpd.config.external_zone) external_zone=$(uci -q get upnpd.config.external_zone)
. /lib/functions/network.sh . /lib/functions/network.sh
@ -41,6 +41,6 @@ fi
[ "$DEVICE" != "$ifname" ] && [ "$DEVICE" != "$ifname6" ] && exit 0 [ "$DEVICE" != "$ifname" ] && [ "$DEVICE" != "$ifname6" ] && exit 0
grep -q "^ext_ifname=$ifname" "$tmpconf" && grep -q "^ext_ifname6=$ifname6" "$tmpconf" && exit 0 grep -qs "^ext_ifname=$ifname" "$tmpconf" && grep -qs "^ext_ifname6=$ifname6" "$tmpconf" && exit 0
/etc/init.d/miniupnpd restart /etc/init.d/miniupnpd restart