From 8aba9a00dc86253f48d878445010cfa68b777b6a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 5 Jul 2011 00:52:10 +0000 Subject: 6in4, 6to4: prevent starting the tunnel if kmod-sit is not yet loaded (#9643) SVN-Revision: 27449 --- package/6in4/Makefile | 4 ++-- package/6in4/files/6in4.hotplug | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'package/6in4') diff --git a/package/6in4/Makefile b/package/6in4/Makefile index 9a2cfe2..14b7eac 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 49667a8..9df9934 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 -- cgit v1.1