From: Jo-Philipp Wich Date: Mon, 17 May 2010 19:34:08 +0000 (+0000) Subject: base-files: use uci_get() wrapper (#7312) X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ea06a67eac000f3e793ddcb945cbdf222a32c7e0;p=openwrt%2Fstaging%2Fmkresin.git base-files: use uci_get() wrapper (#7312) SVN-Revision: 21490 --- 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