From ad39aa14bb802aa48e7c005173b212b342ef3770 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 29 Jan 2013 14:40:04 +0000 Subject: netifd: update to latest version fixes DNS servers on reload (#12910) fixes ubus object race on reload or down/up (#12612) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35383 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/config/netifd/files/sbin/ifstatus | 2 +- package/network/config/netifd/files/sbin/ifup | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'package/network/config/netifd/files/sbin') diff --git a/package/network/config/netifd/files/sbin/ifstatus b/package/network/config/netifd/files/sbin/ifstatus index 511cc1d8d..8a951e6e1 100755 --- a/package/network/config/netifd/files/sbin/ifstatus +++ b/package/network/config/netifd/files/sbin/ifstatus @@ -10,4 +10,4 @@ ubus -S list "network.interface.$INTERFACE" >/dev/null || { echo "Interface $INTERFACE not found" exit 1 } -ubus call network.interface."$INTERFACE" status +ubus call network.interface status "{ \"interface\" : \"$INTERFACE\" }" diff --git a/package/network/config/netifd/files/sbin/ifup b/package/network/config/netifd/files/sbin/ifup index e6dbb3541..af3aaa845 100755 --- a/package/network/config/netifd/files/sbin/ifup +++ b/package/network/config/netifd/files/sbin/ifup @@ -6,7 +6,7 @@ setup_wifi= if_call() { local interface="$1" for mode in $modes; do - ubus call $interface $mode + ubus call network.interface $mode "{ \"interface\" : \"$interface\" }" done } @@ -38,7 +38,7 @@ done [ "$modes" = "down up" ] && ubus call network reload if [ -n "$ifup_all" ]; then for interface in `ubus -S list 'network.interface.*'`; do - if_call "$interface" + if_call "${interface##network.interface.}" done [ -n "$setup_wifi" ] && /sbin/wifi up exit @@ -47,7 +47,7 @@ else echo "Interface $1 not found" exit } - if_call "network.interface.$1" + if_call "$1" fi if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then -- cgit v1.2.3