From: jow Date: Fri, 15 Jul 2011 14:54:45 +0000 (+0000) Subject: [backfire] backport r27614 X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=0bf97c2e3c217074d9ea6117b215e27585fada38 [backfire] backport r27614 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27615 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/uci/Makefile b/package/uci/Makefile index 7210ca29a..4309f2a0d 100644 --- a/package/uci/Makefile +++ b/package/uci/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,7 +12,7 @@ UCI_RELEASE=6 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_REV:=aa3ab8012bfbf793d2884c08ea924545a04e9544 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/uci/files/lib/config/uci.sh b/package/uci/files/lib/config/uci.sh index 8dcb92b9f..db84c8343 100644 --- a/package/uci/files/lib/config/uci.sh +++ b/package/uci/files/lib/config/uci.sh @@ -71,6 +71,11 @@ uci_set_state() { /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state set "$PACKAGE.$CONFIG${OPTION:+.$OPTION}=$VALUE" } +uci_toggle_state() { + uci_revert_state "$1" "$2" "$3" + uci_set_state "$1" "$2" "$3" "$4" +} + uci_set() { local PACKAGE="$1" local CONFIG="$2"