dnsmasq: restore ability to include/exclude raw device names
Commit5cd88f4
"dnsmasq: remove use of uci state for getting network ifname" broke the ability to specify unmanaged network device names for inclusion and exclusion in the uci configuration. Restore support for raw device names by falling back to the input value when "network_get_device" yields no result. Fixes FS#876. Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commita89c36b508
)
This commit is contained in:
parent
ee6fa8d839
commit
367b4563b4
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=dnsmasq
|
||||
PKG_VERSION:=2.78
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/
|
||||
|
|
|
@ -116,12 +116,12 @@ append_ipset() {
|
|||
}
|
||||
|
||||
append_interface() {
|
||||
network_get_device ifname "$1" || return
|
||||
network_get_device ifname "$1" || ifname="$1"
|
||||
xappend "--interface=$ifname"
|
||||
}
|
||||
|
||||
append_notinterface() {
|
||||
network_get_device ifname "$1" || return
|
||||
network_get_device ifname "$1" || ifname="$1"
|
||||
xappend "--except-interface=$ifname"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue