[backfire] merge r27449

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27450 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 60dce9faf7e7e3f90d196d7a767e3f7b7b3121c7..65b10542e695e6501a7fc589dec1dd23246c1985 100644 (file)
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
 PKG_VERSION:=9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 49667a815e1caa1a9aaf5b91b4eb8cbedb91880f..9df993498a1f6ae5fad21e37687d50ff90674473 100644 (file)
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -20,6 +20,11 @@ if [ "$ACTION" = ifup ]; then
                local wanip=$(find_6in4_wanip "$wandev")
 
                [ -n "$wanip" ] && {
+                       lsmod | grep -q ^sit || {
+                               logger -t 6in4-update "Tunneling driver not loaded yet, deferring action"
+                               exit 0
+                       }
+
                        local tunnelid
                        config_get tunnelid "$cfg" tunnelid
 

diff --git a/package/6to4/Makefile b/package/6to4/Makefile
index 77082a4a046ca88b88e2f63be0b097db8c13d56e..f4831a49057c0f144e0e4c2d92b5b789dc468e9c 100644 (file)
--- a/package/6to4/Makefile
+++ b/package/6to4/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6to4
 PKG_VERSION:=5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/6to4/files/6to4.hotplug b/package/6to4/files/6to4.hotplug
index 037abd48f5b3b1096c61dbcfd021285a1ab56d68..1e3d26c418843cfd763d3ef50958d43f020edd6c 100644 (file)
--- a/package/6to4/files/6to4.hotplug
+++ b/package/6to4/files/6to4.hotplug
@@ -20,6 +20,11 @@ if [ "$ACTION" = ifup ]; then
                local wanip=$(find_6to4_wanip "$wandev")
 
                [ -n "$wanip" ] && {
+                       lsmod | grep -q ^sit || {
+                               logger -t 6to4 "Tunneling driver not loaded yet, deferring action"
+                               exit 0
+                       }
+
                        uci_set_state network "$cfg" ipaddr "$wanip"
                        ( ifup "$cfg" )&
                }