From 13333a67423e02e4cb3e23ccf18ebdecf24a14dd Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 2 Mar 2011 19:20:29 +0000 Subject: [PATCH] firewall: move include sourcing into a subshell, this makes the firewall init immune against exit in the include scripts SVN-Revision: 25835 --- package/firewall/Makefile | 2 +- package/firewall/files/lib/core_init.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/firewall/Makefile b/package/firewall/Makefile index 3d61e098896..a8a62c287d0 100644 --- a/package/firewall/Makefile +++ b/package/firewall/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall PKG_VERSION:=2 -PKG_RELEASE:=22 +PKG_RELEASE:=23 include $(INCLUDE_DIR)/package.mk diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh index c7e41e7ff7d..42124b39bd4 100644 --- a/package/firewall/files/lib/core_init.sh +++ b/package/firewall/files/lib/core_init.sh @@ -271,8 +271,10 @@ fw_load_notrack_zone() { fw_load_include() { local name="$1" - local path; config_get path ${name} path - [ -e $path ] && . $path + local path + config_get path ${name} path + + [ -e $path ] && ( . $path ) } -- 2.30.2