domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate basic UCI config file validation support Needs more testing and validation is not enforced yet

Browse Source 
Code contributed by Fraunhofer Fokus

SVN-Revision: 6391
This commit is contained in:
Felix Fietkau
2007-02-26 20:04:04 +00:00
parent c6a4f047e3
commit 9405a2a6be
8 changed files with 656 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package/base-files/files/lib/config/uci.sh Executable file → Normal file
View File

@@ -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"
}