diff options
author | John Crispin <blogic@openwrt.org> | 2014-06-30 09:57:29 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2014-06-30 09:57:29 +0000 |
commit | 1a7223795f4fa449b5c85bc97bc7454f103a0c85 (patch) | |
tree | eb771a496273f640b41dcb9fbecf57e9f2470790 /package/system/procd/files/procd.sh | |
parent | 6f80caf974f8061993477b155f5ca72df5471d4f (diff) | |
download | upstream-1a7223795f4fa449b5c85bc97bc7454f103a0c85.tar.gz upstream-1a7223795f4fa449b5c85bc97bc7454f103a0c85.tar.bz2 upstream-1a7223795f4fa449b5c85bc97bc7454f103a0c85.zip |
procd: fix uci_validation
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41414 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system/procd/files/procd.sh')
-rw-r--r-- | package/system/procd/files/procd.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 67924a2749..c5fd512486 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -269,9 +269,10 @@ uci_validate_section() local _package="$1" local _type="$2" local _name="$3" + local _result local _error 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=$? eval "$_result" [ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null` |