From: cyrus Date: Tue, 26 Feb 2013 12:50:52 +0000 (+0000) Subject: 6relayd: Fix config behaviour for rewrite_dns_addr option X-Git-Tag: fast2504n-3.10.28-merged~3262 X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b0f86088a14473987f7433b8066a9a0e5c07b1a9;p=openwrt.git 6relayd: Fix config behaviour for rewrite_dns_addr option git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35804 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile index 790f5e2772..8fe7977800 100644 --- a/package/network/ipv6/6relayd/Makefile +++ b/package/network/ipv6/6relayd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6relayd -PKG_VERSION:=2013-02-26 +PKG_VERSION:=2013-02-26.1 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init index 410164a9d7..ef0c711224 100644 --- a/package/network/ipv6/6relayd/files/6relayd.init +++ b/package/network/ipv6/6relayd/files/6relayd.init @@ -69,7 +69,7 @@ start_6relayd() { local always_rewrite_dns rewrite_dns_addr config_get_bool always_rewrite_dns "$cfg" always_rewrite_dns 0 config_get rewrite_dns_addr "$cfg" rewrite_dns_addr - [ "$always_rewrite_dns" -eq 1 ] && append args "-n$rewrite_dns_addr" + [ "$always_rewrite_dns" -eq 1 -o -n "$rewrite_dns_addr" ] && append args "-n$rewrite_dns_addr" local always_assume_default config_get_bool always_assume_default "$cfg" always_assume_default 0