[package] base-files: use uci_get() wrapper (#7312)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21490 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 ef59004..42ff29e 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
        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"
                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 b32b2c9..ceabf4b 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_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
 setup_interface () {
        local old_ip
        local old_broadcast