diff options
| author | Nicolas Thill <nico@openwrt.org> | 2011-11-08 22:47:54 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2011-11-08 22:47:54 +0000 |
| commit | ffb73b4526fe6fbefa96aea177c42cc30667095f (patch) | |
| tree | b513e03563cf56c2874a272d79e31692f6035135 | |
| parent | ff9120ca0077f6d1ad523979eeab0c2f3b1f3414 (diff) | |
| download | upstream-ffb73b4526fe6fbefa96aea177c42cc30667095f.tar.gz upstream-ffb73b4526fe6fbefa96aea177c42cc30667095f.tar.bz2 upstream-ffb73b4526fe6fbefa96aea177c42cc30667095f.zip | |
package/base-files-network: use new service wrappers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28866 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files-network/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files-network/files/lib/network/config.sh | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/package/base-files-network/Makefile b/package/base-files-network/Makefile index 78c9981e6b..ead9458098 100644 --- a/package/base-files-network/Makefile +++ b/package/base-files-network/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files-network -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DEPENDS:=opkg/host diff --git a/package/base-files-network/files/lib/network/config.sh b/package/base-files-network/files/lib/network/config.sh index 74810e47d0..da45089dff 100755 --- a/package/base-files-network/files/lib/network/config.sh +++ b/package/base-files-network/files/lib/network/config.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # DEBUG="echo" @@ -368,7 +368,9 @@ setup_interface() { dhcp) # kill running udhcpc instance local pidfile="/var/run/dhcp-${iface}.pid" - service_kill udhcpc "$pidfile" + + SERVICE_PID_FILE="$pidfile" \ + service_stop udhcpc local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts config_get ipaddr "$config" ipaddr @@ -393,7 +395,8 @@ setup_interface() { [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &" [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= - $DEBUG eval udhcpc -t 0 -i "$iface" \ + SERVICE_PID_FILE="$pidfile" \ + service_start /sbin/udhcpc -t 0 -i "$iface" \ ${ipaddr:+-r $ipaddr} \ ${hostname:+-H $hostname} \ ${clientid:+-c $clientid} \ @@ -426,8 +429,8 @@ stop_interface_dhcp() { remove_dns "$config" - local pidfile="/var/run/dhcp-${ifname}.pid" - service_kill udhcpc "$pidfile" + SERVICE_PID_FILE="/var/run/dhcp-${ifname}.pid" \ + service_stop /sbin/udhcpc uci -P /var/state revert "network.$config" } |