aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-05-17 19:34:08 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-05-17 19:34:08 +0000
commite0e58c0e93cbd301941f64a86a5ed808691708be (patch)
treea81341a8765a8808cbf2c280d2262c5be5cd1a22
parent11096c096389544be2689c1417035842b6fcc19f (diff)
downloadupstream-e0e58c0e93cbd301941f64a86a5ed808691708be.tar.gz
upstream-e0e58c0e93cbd301941f64a86a5ed808691708be.tar.bz2
upstream-e0e58c0e93cbd301941f64a86a5ed808691708be.zip
[package] base-files: use uci_get() wrapper (#7312)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21490 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/files/etc/hotplug.d/net/10-net2
-rwxr-xr-xpackage/base-files/files/usr/share/udhcpc/default.script5
2 files changed, 1 insertions, 6 deletions
diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index ef59004645..42ff29e799 100644
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -46,7 +46,7 @@ delif() {
for ifc in $interfaces; do
config_get iftype "$ifc" type
config_get ifs "$ifc" device
- confdevs="$(uci get network.$ifc.ifname)"
+ confdevs="$(uci_get network.$ifc.ifname)"
for dev in $ifs; do
[ "${dev%%\.*}" = "$INTERFACE" ] && {
list_contains confdevs "$dev" || list_remove ifs "$dev"
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index b32b2c9f25..ceabf4bf3a 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -11,11 +11,6 @@ change_state () {
uci_set_state "$1" "$2" "$3" "$4"
}
-uci_get() {
- [ -n "$ifc" ] || return
- uci -P /dev/null get "$1" 2>/dev/null
-}
-
setup_interface () {
local old_ip
local old_broadcast