EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

6in4, 6to4: prevent starting the tunnel if kmod-sit is not yet loaded (#9643)

Browse Source 
SVN-Revision: 27449
This commit is contained in:
Jo-Philipp Wich 2011-07-05 00:52:10 +00:00
parent 7c3bbe150a
commit 8aba9a00dc
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/6in4/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=9 PKG_VERSION:=9
PKG_RELEASE:=1 PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

5
package/6in4/files/6in4.hotplug
View File

@ -20,6 +20,11 @@ if [ "$ACTION" = ifup ]; then
local wanip=$(find_6in4_wanip "$wandev") local wanip=$(find_6in4_wanip "$wandev")
[ -n "$wanip" ] && { [ -n "$wanip" ] && {
lsmod | grep -q ^sit || {
logger -t 6in4-update "Tunneling driver not loaded yet, deferring action"
exit 0
}
local tunnelid local tunnelid
config_get tunnelid "$cfg" tunnelid config_get tunnelid "$cfg" tunnelid

2
package/6to4/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=6to4 PKG_NAME:=6to4
PKG_VERSION:=5 PKG_VERSION:=5
PKG_RELEASE:=1 PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

5
package/6to4/files/6to4.hotplug
View File

@ -20,6 +20,11 @@ if [ "$ACTION" = ifup ]; then
local wanip=$(find_6to4_wanip "$wandev") local wanip=$(find_6to4_wanip "$wandev")
[ -n "$wanip" ] && { [ -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" uci_set_state network "$cfg" ipaddr "$wanip"
( ifup "$cfg" )& ( ifup "$cfg" )&
} }