From 6a7755ee8f7f67fab5a57d2a69236cb1bcfd550f Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 17 May 2010 19:34:08 +0000 Subject: [package] base-files: use uci_get() wrapper (#7312) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21490 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/hotplug.d/net/10-net | 2 +- package/base-files/files/usr/share/udhcpc/default.script | 5 ----- 2 files changed, 1 insertion(+), 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 ef5900464..42ff29e79 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 b32b2c9f2..ceabf4bf3 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 -- cgit v1.2.3