aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-01-02 11:38:36 +0000
committerSteven Barth <cyrus@openwrt.org>2014-01-02 11:38:36 +0000
commitbc370646cd1e25e535f564ae662c9683f1646898 (patch)
treeea4285492751d1d959f591abb42c39cf717c62a2 /package/network
parent20151a3394d446cc129f59aa2893c8af61e6c929 (diff)
downloadupstream-bc370646cd1e25e535f564ae662c9683f1646898.tar.gz
upstream-bc370646cd1e25e535f564ae662c9683f1646898.tar.bz2
upstream-bc370646cd1e25e535f564ae662c9683f1646898.zip
6relayd: try to workaround race condition at startup
SVN-Revision: 39184
Diffstat (limited to 'package/network')
-rw-r--r--package/network/ipv6/6relayd/Makefile2
-rw-r--r--package/network/ipv6/6relayd/files/6relayd.init6
2 files changed, 4 insertions, 4 deletions
diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index 6f3c173173..f3811a9530 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-10-21
+PKG_VERSION:=2013-10-21.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 89b8610b49..68816b765f 100644
--- a/package/network/ipv6/6relayd/files/6relayd.init
+++ b/package/network/ipv6/6relayd/files/6relayd.init
@@ -34,7 +34,7 @@ start_6relayd() {
local master masterif
config_get masterif "$cfg" master
network_get_device master "$masterif"
- [ -z "$master" ] && master="."
+ [ -z "$master" -o "$master" = "$masterif" ] && master="."
# Detect slave interfaces
local slaves=""
@@ -45,10 +45,10 @@ start_6relayd() {
network_get_device slave "$slaveif"
# Compatibility with old config format
if [ "$mode" = "relay" -a "$master" = "." ]; then
- [ -z "$slave" ] && return 0
+ [ -z "$slave" -o "$slave" = "$slaveif" ] && return 0
master="$slave"
else
- [ -n "$slave" ] && append slaves "$slave"
+ [ -n "$slave" -o "$slave" = "$slaveif" ] && append slaves "$slave"
fi
done