Просмотр исходного кода

firewall: move include sourcing into a subshell, this makes the firewall init immune against exit in the include scripts

SVN-Revision: 25835
Jo-Philipp Wich 15 лет назад
Родитель
Сommit
13333a6742
2 измененных файлов с 5 добавлено и 3 удалено
  1. 1 1
      package/firewall/Makefile
  2. 4 2
      package/firewall/files/lib/core_init.sh

+ 1 - 1
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
 

+ 4 - 2
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 )
 }