polarssl: bump to 1.3.7

[openwrt/staging/mkresin.git] / package / network / ipv6 / 6relayd / files / 6relayd.init

diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
index 89b8610b4969058b9e118853a7aac249334cc236..68816b765f52264f90259d9cfd7ca8170d4e28e5 100644 (file)
--- 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