aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-02-26 12:50:52 +0000
committerSteven Barth <steven@midlink.org>2013-02-26 12:50:52 +0000
commit13ada38511f8c72d23d34ecacf82404310c87f4a (patch)
tree5351394636e1869a1574a0aacc8c68dab4bd4f8d /package
parent579f6c46327e777615c5f2eeac249de0a3d1039d (diff)
downloadmaster-187ad058-13ada38511f8c72d23d34ecacf82404310c87f4a.tar.gz
master-187ad058-13ada38511f8c72d23d34ecacf82404310c87f4a.tar.bz2
master-187ad058-13ada38511f8c72d23d34ecacf82404310c87f4a.zip
6relayd: Fix config behaviour for rewrite_dns_addr option
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35804 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/network/ipv6/6relayd/Makefile2
-rw-r--r--package/network/ipv6/6relayd/files/6relayd.init2
2 files changed, 2 insertions, 2 deletions
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