diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-17 19:34:08 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-17 19:34:08 +0000 |
| commit | ea06a67eac000f3e793ddcb945cbdf222a32c7e0 (patch) | |
| tree | 3a31d3bab6d814d6adff55c7478ecca004c0d50a | |
| parent | 6efb515be1251b3a6dbb3ac1547070f8e57e68da (diff) | |
| download | upstream-ea06a67eac000f3e793ddcb945cbdf222a32c7e0.tar.gz upstream-ea06a67eac000f3e793ddcb945cbdf222a32c7e0.tar.bz2 upstream-ea06a67eac000f3e793ddcb945cbdf222a32c7e0.zip | |
base-files: use uci_get() wrapper (#7312)
SVN-Revision: 21490
| -rw-r--r-- | package/base-files/files/etc/hotplug.d/net/10-net | 2 | ||||
| -rwxr-xr-x | package/base-files/files/usr/share/udhcpc/default.script | 5 |
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 |