[source] dnsmasq: restore ability to include/exclude raw device names

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 25 00:58:26 PDT 2017


jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/367b4563b4cd466188bd4c8cf24ff0a125029c1c

commit 367b4563b4cd466188bd4c8cf24ff0a125029c1c
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Mon Jul 10 10:53:29 2017 +0200

    dnsmasq: restore ability to include/exclude raw device names
    
    Commit 5cd88f4 "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 at mein.io>
    (cherry picked from commit a89c36b50875e61c790113d3adee10621575788a)
---
 package/network/services/dnsmasq/Makefile           | 2 +-
 package/network/services/dnsmasq/files/dnsmasq.init | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 94fd702..8eed542 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -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/
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index a762cd3..1ecbb3c 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -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"
 }
 



More information about the lede-commits mailing list