6relayd: try to workaround race condition at startup
SVN-Revision: 39184
This commit is contained in:
parent
20151a3394
commit
bc370646cd
2 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue