osiris: merge r28889

SVN-Revision: 30166

diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile
index e2c6165dd603ff10c1c8afb017e32ce69504fa73..898d920028cb23881851f0af0ef2b5dd3249ef30 100644 (file)
--- a/admin/osiris/Makefile
+++ b/admin/osiris/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=osiris
 PKG_VERSION:=4.2.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://osiris.shmoo.com/data/

diff --git a/admin/osiris/files/osirisd.init b/admin/osiris/files/osirisd.init
index 9916567b879b3920299ab954b45c497a833e2c7b..1ce739b227d5f109ff5702f2d5da389dfd1ff5ee 100644 (file)
--- a/admin/osiris/files/osirisd.init
+++ b/admin/osiris/files/osirisd.init
@@ -1,20 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-BIN=osirisd
-DEFAULT=/etc/default/$BIN
-LIB_D=/var/lib/osiris
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+SERVICE_USE_PID=1
 
 start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $LIB_D
-       mkdir -p $RUN_D
-       $BIN $OPTIONS
+       mkdir -0755 -p /var/lib/osiris
+       service_start /usr/sbin/osirisd
 }
+
 stop() {
-       [ -f $PID_F ] && kill $(cat $PID_F)
+       service_stop /usr/sbin/osirisd
 }
-