KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

procd: fix uci_validation

Browse source 
Regardles of the return code from validate_data _error variable will be 0 due
to 'local' command in the previous line. With this patch we are able to catch
the return code from validate_data tool.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 41414
This commit is contained in:
John Crispin 2014-06-30 09:57:29 +00:00
parent a7863b1368
commit 9912d02fa1
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
package/system/procd/Makefile
View file

@ -1,7 +1,14 @@
#
# Copyright (C) 2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=procd PKG_NAME:=procd
PKG_VERSION:=2014-06-19 PKG_VERSION:=2014-06-27
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)

3
package/system/procd/files/procd.sh
View file

@ -269,9 +269,10 @@ uci_validate_section()
local _package="$1" local _package="$1"
local _type="$2" local _type="$2"
local _name="$3" local _name="$3"
local _result
local _error local _error
shift; shift; shift shift; shift; shift
local _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null` _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
_error=$? _error=$?
eval "$_result" eval "$_result"
[ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null` [ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null`