From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:35:24 +0000 (+0000)
Subject: [packages_10.03.2] xinetd: merge r28748, r28908
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=a48a4b5031e71dccf5fff38cff12b6e7956a9246

[packages_10.03.2] xinetd: merge r28748, r28908

SVN-Revision: 30281
---

diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile
index 9c33cdd0fe..52b1deab27 100644
--- a/net/xinetd/Makefile
+++ b/net/xinetd/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 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:=xinetd
 PKG_VERSION:=2.3.14
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.xinetd.org/
diff --git a/net/xinetd/files/xinetd.init b/net/xinetd/files/xinetd.init
index a1747f0619..1437f587c5 100644
--- a/net/xinetd/files/xinetd.init
+++ b/net/xinetd/files/xinetd.init
@@ -1,18 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-DEFAULT=/etc/default/xinetd
-RUN_D=/var/run
-PID_F=$RUN_D/xinetd.pid
+SERVICE_USE_PID=1
 
 start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	[ -d $RUN_D ] || mkdir -p $RUN_D
-	xinetd $OPTIONS
+	service_start /usr/sbin/xinetd -pidfile /var/run/xinetd.pid
 }
 
 stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
+	service_stop /usr/sbin/xinetd
 }