From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 5 Feb 2012 03:18:30 +0000 (+0000)
Subject: [packages_10.03.2] osiris: merge r28889
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=c3547324b3bff8dbcf4f43fe42cbfee333e28aab;p=10.03%2Fpackages.git

[packages_10.03.2] osiris: merge r28889

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30166 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile
index e2c6165..898d920 100644
--- 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 9916567..1ce739b 100644
--- 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
 }
-