diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-02-26 20:04:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-02-26 20:04:04 +0000 |
| commit | 9405a2a6be701ee92ad0ffbe15d069bdae2cf850 (patch) | |
| tree | cf424b438b74334f93b8474935787dc07aca5839 /package/base-files/files/lib/config/uci.sh | |
| parent | c6a4f047e30eb534dfbf7598d5998404ade53c67 (diff) | |
| download | upstream-9405a2a6be701ee92ad0ffbe15d069bdae2cf850.tar.gz upstream-9405a2a6be701ee92ad0ffbe15d069bdae2cf850.tar.bz2 upstream-9405a2a6be701ee92ad0ffbe15d069bdae2cf850.zip | |
Integrate basic UCI config file validation support Needs more testing and validation is not enforced yet
Code contributed by Fraunhofer Fokus
SVN-Revision: 6391
Diffstat (limited to 'package/base-files/files/lib/config/uci.sh')
| -rw-r--r--[-rwxr-xr-x] | package/base-files/files/lib/config/uci.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/package/base-files/files/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh index 12795d813f..43bb981cc6 100755..100644 --- a/package/base-files/files/lib/config/uci.sh +++ b/package/base-files/files/lib/config/uci.sh @@ -1,8 +1,8 @@ #!/bin/sh # Shell script defining macros for manipulating config files # -# Copyright (C) 2006 by Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de> -# Copyright (C) 2006 by Felix Fietkau <nbd@openwrt.org> +# Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de> +# Copyright (C) 2006,2007 Felix Fietkau <nbd@openwrt.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ uci_load() { uci_do_update() { local FILENAME="$1" local UPDATE="$2" - awk -f /lib/config/uci-update.awk -f - <<EOF + awk -f $UCI_ROOT/lib/config/uci-update.awk -f - <<EOF BEGIN { config = read_file("$FILENAME") $UPDATE @@ -94,9 +94,10 @@ uci_remove() { uci_commit() { local PACKAGE="$1" local PACKAGE_BASE="$(basename "$PACKAGE")" - + mkdir -p /tmp/.uci - lock "/tmp/.uci/$PACKAGE_BASE.lock" + LOCK=`which lock` || LOCK=: + $LOCK "/tmp/.uci/$PACKAGE_BASE.lock" [ -f "/tmp/.uci/$PACKAGE_BASE" ] && ( updatestr="" @@ -128,13 +129,13 @@ uci_commit() { } config_load "$PACKAGE" - CONFIG_FILENAME="${CONFIG_FILENAME:-$ROOT/etc/config/$PACKAGE_BASE}" + CONFIG_FILENAME="${CONFIG_FILENAME:-$UCI_ROOT/etc/config/$PACKAGE_BASE}" uci_do_update "$CONFIG_FILENAME" "$updatestr" > "/tmp/.uci/$PACKAGE_BASE.new" && { mv -f "/tmp/.uci/$PACKAGE_BASE.new" "$CONFIG_FILENAME" && \ rm -f "/tmp/.uci/$PACKAGE_BASE" } ) - lock -u "/tmp/.uci/$PACKAGE_BASE.lock" + $LOCK -u "/tmp/.uci/$PACKAGE_BASE.lock" } |