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

packages/olsrd: use new service functions (again)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29172 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-16 09:44:11 +00:00
parent 74b4a18a59
commit 4fb5622c35
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/olsrd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=olsrd PKG_NAME:=olsrd
PKG_VERSION:=0.6.2 PKG_VERSION:=0.6.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6

40
net/olsrd/files/olsrd.init
View File

@ -2,7 +2,10 @@
# Copyright (C) 2008-2011 OpenWrt.org # Copyright (C) 2008-2011 OpenWrt.org
START=65 START=65
BIN=/usr/sbin/olsrd
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
CONF=/var/etc/olsrd.conf CONF=/var/etc/olsrd.conf
PID=/var/run/olsrd.pid PID=/var/run/olsrd.pid
PID6=/var/run/olsrd.ipv6.pid PID6=/var/run/olsrd.ipv6.pid
@ -637,6 +640,10 @@ olsrd_setup_smartgw_rules() {
fi fi
} }
error() {
echo "${initscript}:" "$@" 1>&2
}
start() { start() {
SYSTEM_HOSTNAME= SYSTEM_HOSTNAME=
SYSTEM_LAT= SYSTEM_LAT=
@ -684,16 +691,18 @@ start() {
sed -i "s/$f/$f.ipv6/g" /var/etc/olsrd.conf.ipv6 sed -i "s/$f/$f.ipv6/g" /var/etc/olsrd.conf.ipv6
done done
if ([ -s $PID6 ] && kill -0 $(cat $PID6) 2>&-); then SERVICE_PID_FILE="$PID6"
echo "Error: There already is a IPv6 instance of olsrd running ($(cat $PID6)), not starting." if service_check /usr/sbin/olsrd; then
error "there already is an IPv6 instance of olsrd running ($(cat $PID6)), not starting."
else else
start-stop-daemon -q -b -m -p $PID6 -x $BIN -S -- -f /var/etc/olsrd.conf.ipv6 -nofork service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv6 -nofork
fi fi
if ([ -s $PID ] && kill -0 $(cat $PID) 2>&-); then SERVICE_PID_FILE="$PID"
echo "Error: There already is a IPv4 instance of olsrd running ($(cat $PID)), not starting." if service_check /usr/sbin/olsrd; then
error "there already is an IPv4 instance of olsrd running ($(cat $PID)), not starting."
else else
start-stop-daemon -q -b -m -p $PID -x $BIN -S -- -f /var/etc/olsrd.conf.ipv4 -nofork service_start /usr/sbin/olsrd -f /var/etc/olsrd.conf.ipv4 -nofork
fi fi
sleep 3 sleep 3
@ -705,20 +714,21 @@ start() {
sed -i '/[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/d' "$OLSRD_CONFIG_FILE" sed -i '/[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}/d' "$OLSRD_CONFIG_FILE"
fi fi
### check for running instance SERVICE_PID_FILE="$PID"
if ([ -s $PID ] && kill -0 $(cat $PID) 2>&-); then if service_check /usr/sbin/olsrd; then
echo "Error: There already is a instance of olsrd running ($(cat $PID)), exiting now." error "there already is an IPv4 instance of olsrd running ($(cat $PID)), not starting."
return 1 return 1
else else
start-stop-daemon -q -b -m -p $PID -x $BIN -S -- -f "$OLSRD_CONFIG_FILE" -nofork service_start /usr/sbin/olsrd -f "$OLSRD_CONFIG_FILE" -nofork
fi fi
fi fi
olsrd_setup_smartgw_rules olsrd_setup_smartgw_rules
} }
stop() { stop() {
start-stop-daemon -q -p $PID -x $BIN -K SERVICE_PID_FILE="$PID"
start-stop-daemon -q -p $PID6 -x $BIN -K service_stop /usr/sbin/olsrd
test -s $PID && rm $PID
test -s $PID6 && rm $PID6 SERVICE_PID_FILE="$PID6"
service_stop /usr/sbin/olsrd
} }