bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages/wide-dhcpv6: use new service functions

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@28929 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-09 23:49:28 +00:00
parent bc5822e1f6
commit 59fcb0e89a
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipv6/wide-dhcpv6/Makefile
View File

@ -1,3 +1,9 @@
#
# Copyright (C) 2010-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk

24
ipv6/wide-dhcpv6/files/dhcp6s.init
View File

@ -1,4 +1,7 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2010-2011 OpenWrt.org
SERVICE_USE_PID=1
get_ifname() { get_ifname() {
local interface=$1 local interface=$1
@ -10,7 +13,6 @@ get_ifname() {
} }
start() { start() {
[ ! -e /etc/dhcp6sctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6sctlkey` [ ! -e /etc/dhcp6sctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6sctlkey`
[ -e /var/run/dhcp6s.pid ] && return 0 [ -e /var/run/dhcp6s.pid ] && return 0
@ -18,33 +20,27 @@ start() {
include /lib/network include /lib/network
config_load "dhcp6s" config_load "dhcp6s"
local enabled local enabled
config_get_bool enabled basic enabled 0 config_get_bool enabled basic enabled 0
[ $enabled -eq 0 ] && return 0 [ $enabled -eq 0 ] && return 0
logger starting dhcp6s logger starting dhcp6s
local server_interface local server_interface
config_get server_interface basic interface config_get server_interface basic interface
local server_ifname=$(get_ifname "$server_interface") local server_ifname=$(get_ifname "$server_interface")
local config_file local config_file
config_get config_file basic config_file config_get config_file basic config_file
[ ! -e $config_file ] && return 1 [ ! -e $config_file ] && return 1
/usr/sbin/dhcp6s -c $config_file $server_ifname service_start /usr/sbin/dhcp6s -c $config_file $server_ifname
return 0
} }
stop() { stop() {
logger stopping dhcp6s logger stopping dhcp6s
kill -TERM `cat /var/run/dhcp6s.pid` service_stop /usr/sbin/dhcp6s
return 0
} }