diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-05 00:52:10 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-05 00:52:10 +0000 |
| commit | fc026910611534dcc98204b9ea004afffe1d2ed5 (patch) | |
| tree | b9dcf1188512d6086aa51198822eeed332ffea51 | |
| parent | 5e1e039c459374ac2908318a7bfdad5eac8b0bff (diff) | |
| download | upstream-fc026910611534dcc98204b9ea004afffe1d2ed5.tar.gz upstream-fc026910611534dcc98204b9ea004afffe1d2ed5.tar.bz2 upstream-fc026910611534dcc98204b9ea004afffe1d2ed5.zip | |
[package] 6in4, 6to4: prevent starting the tunnel if kmod-sit is not yet loaded (#9643)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27449 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/6in4/Makefile | 4 | ||||
| -rw-r--r-- | package/6in4/files/6in4.hotplug | 5 | ||||
| -rw-r--r-- | package/6to4/Makefile | 2 | ||||
| -rw-r--r-- | package/6to4/files/6to4.hotplug | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile index 9a2cfe20d2..14b7eac816 100644 --- 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 49667a815e..9df993498a 100644 --- 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 77082a4a04..f4831a4905 100644 --- 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 037abd48f5..1e3d26c418 100644 --- 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" )& } |