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 ef590046452ecfdceb9e0c8e0f04952e41bdd12b..42ff29e799684fd6aef4063b9adacb2594d4fd95 100644 (file)
--- 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 b32b2c9f256e5c941f2fe0e5fd0f98399ded6dad..ceabf4bf3a3074de78a8ef6fe09b93b6d6f7ff9a 100755 (executable)
--- 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