mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-23 22:59:40 +02:00
[backfire] merge r21489-r21494
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21592 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
4296e8d445
commit
6447649ddd
@ -46,7 +46,7 @@ delif() {
|
|||||||
for ifc in $interfaces; do
|
for ifc in $interfaces; do
|
||||||
config_get iftype "$ifc" type
|
config_get iftype "$ifc" type
|
||||||
config_get ifs "$ifc" device
|
config_get ifs "$ifc" device
|
||||||
confdevs="$(uci get network.$ifc.ifname)"
|
confdevs="$(uci_get network.$ifc.ifname)"
|
||||||
for dev in $ifs; do
|
for dev in $ifs; do
|
||||||
[ "${dev%%\.*}" = "$INTERFACE" ] && {
|
[ "${dev%%\.*}" = "$INTERFACE" ] && {
|
||||||
list_contains confdevs "$dev" || list_remove ifs "$dev"
|
list_contains confdevs "$dev" || list_remove ifs "$dev"
|
||||||
|
@ -11,11 +11,6 @@ change_state () {
|
|||||||
uci_set_state "$1" "$2" "$3" "$4"
|
uci_set_state "$1" "$2" "$3" "$4"
|
||||||
}
|
}
|
||||||
|
|
||||||
uci_get() {
|
|
||||||
[ -n "$ifc" ] || return
|
|
||||||
uci -P /dev/null get "$1" 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
setup_interface () {
|
setup_interface () {
|
||||||
local old_ip
|
local old_ip
|
||||||
local old_broadcast
|
local old_broadcast
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
START=50
|
START=50
|
||||||
|
|
||||||
start () {
|
start () {
|
||||||
loglevel=$(/sbin/uci get "system.@system[0].cronloglevel" 2>/dev/null)
|
loglevel=$(uci_get "system.@system[0].cronloglevel")
|
||||||
[ -z "$(ls /etc/crontabs/)" ] && exit 1
|
[ -z "$(ls /etc/crontabs/)" ] && exit 1
|
||||||
mkdir -p /var/spool/cron
|
mkdir -p /var/spool/cron
|
||||||
ln -s /etc/crontabs /var/spool/cron/ 2>/dev/null
|
ln -s /etc/crontabs /var/spool/cron/ 2>/dev/null
|
||||||
|
@ -12,7 +12,7 @@ UCI_RELEASE=5
|
|||||||
|
|
||||||
PKG_NAME:=uci
|
PKG_NAME:=uci
|
||||||
PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
|
PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
PKG_REV:=aa3ab8012bfbf793d2884c08ea924545a04e9544
|
PKG_REV:=aa3ab8012bfbf793d2884c08ea924545a04e9544
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Shell script compatibility wrappers for /sbin/uci
|
# Shell script compatibility wrappers for /sbin/uci
|
||||||
#
|
#
|
||||||
|
# Copyright (C) 2008-2010 OpenWrt.org
|
||||||
# Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
|
# Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
@ -41,9 +42,9 @@ uci_load() {
|
|||||||
|
|
||||||
uci_set_default() {
|
uci_set_default() {
|
||||||
local PACKAGE="$1"
|
local PACKAGE="$1"
|
||||||
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$1" > /dev/null && return 0
|
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$PACKAGE" > /dev/null && return 0
|
||||||
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$1"
|
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$PACKAGE"
|
||||||
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$1"
|
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$PACKAGE"
|
||||||
}
|
}
|
||||||
|
|
||||||
uci_revert_state() {
|
uci_revert_state() {
|
||||||
@ -73,6 +74,23 @@ uci_set() {
|
|||||||
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
|
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uci_get_state() {
|
||||||
|
uci_get "$1" "$2" "$3" "$4" "/var/state"
|
||||||
|
}
|
||||||
|
|
||||||
|
uci_get() {
|
||||||
|
local PACKAGE="$1"
|
||||||
|
local CONFIG="$2"
|
||||||
|
local OPTION="$3"
|
||||||
|
local DEFAULT="$4"
|
||||||
|
local STATE="$5"
|
||||||
|
|
||||||
|
/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${STATE:+-P $STATE} -q get "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
|
||||||
|
RET="$?"
|
||||||
|
[ "$RET" -ne 0 ] && [ -n "$DEFAULT" ] && echo "$DEFAULT"
|
||||||
|
return "$RET"
|
||||||
|
}
|
||||||
|
|
||||||
uci_add() {
|
uci_add() {
|
||||||
local PACKAGE="$1"
|
local PACKAGE="$1"
|
||||||
local TYPE="$2"
|
local TYPE="$2"
|
||||||
|
@ -48,7 +48,7 @@ start_instance()
|
|||||||
UHTTPD_KEY=""
|
UHTTPD_KEY=""
|
||||||
|
|
||||||
local cfg="$1"
|
local cfg="$1"
|
||||||
local realm="$(uci get system.@system[0].hostname 2>/dev/null)"
|
local realm="$(uci_get system.@system[0].hostname)"
|
||||||
local listen http https
|
local listen http https
|
||||||
|
|
||||||
append_arg "$cfg" home "-h"
|
append_arg "$cfg" home "-h"
|
||||||
|
Loading…
Reference in New Issue
Block a user