[package] /etc/functions.sh => /lib/functions.sh

[openwrt.git] / package / netifd / files / lib / netifd / proto / dhcp.sh

diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh
index 5219029..1080dbf 100755 (executable)
--- a/package/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/netifd/files/lib/netifd/proto/dhcp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /etc/functions.sh
+. /lib/functions.sh
 . ../netifd-proto.sh
 init_proto "$@"
 
@@ -18,12 +18,7 @@ proto_dhcp_setup() {
        local config="$1"
        local iface="$2"
 
-       json_get_var ipaddr ipaddr
-       json_get_var hostname hostname
-       json_get_var clientid clientid
-       json_get_var vendorid vendorid
-       json_get_var broadcast broadcast
-       json_get_var reqopts reqopts
+       json_get_vars ipaddr hostname clientid vendorid broadcast reqopts
 
        local opt dhcpopts
        for opt in $reqopts; do
@@ -45,7 +40,8 @@ proto_dhcp_setup() {
 }
 
 proto_dhcp_teardown() {
-       proto_kill_command
+       local interface="$1"
+       proto_kill_command "$interface"
 }
 
 add_protocol dhcp