From 49dfbe7b607bdadd1d8c961ad11ba6c449474596 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 9 Nov 2011 23:29:29 +0000
Subject: [PATCH] packages/vsftpd: use new service functions

SVN-Revision: 28907
---
 net/vsftpd/Makefile          | 4 ++--
 net/vsftpd/files/vsftpd.init | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index a1e7147bc5..32cae30a4a 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/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:=vsftpd
 PKG_VERSION:=2.3.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://security.appspot.com/downloads/
diff --git a/net/vsftpd/files/vsftpd.init b/net/vsftpd/files/vsftpd.init
index 303d6cf1bb..ad3e23da5f 100644
--- a/net/vsftpd/files/vsftpd.init
+++ b/net/vsftpd/files/vsftpd.init
@@ -1,14 +1,13 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=50
 
-RUN_D=/var/run/vsftpd
-
 start() {
-	[ -d $RUN_D ] || mkdir -p $RUN_D
-	vsftpd
+	mkdir -m 0755 -p /var/run/vsftpd
+	service_start /usr/sbin/vsftpd
 }
 
 stop() {
-	killall vsftpd
+	service_stop /usr/sbin/vsftpd
 }
-- 
2.30.2