From 675a080743cf02f87ba10be7cc48d5930fd63c9a Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Sep 15 2009 12:18:06 +0000
Subject: - modified init script to be LSB compliant


---

diff --git a/vsftpd.init b/vsftpd.init
index 218b143..920edbc 100755
--- a/vsftpd.init
+++ b/vsftpd.init
@@ -43,8 +43,16 @@ start() {
                         echo -n $"Starting $prog for $site: "
                         daemon /usr/sbin/vsftpd $i
                         RETVAL=$?
-                        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
                         echo
+                        if [ $RETVAL -eq 0 ]; then
+                                touch /var/lock/subsys/$prog
+                                break
+                        else
+                                if [ -f /var/lock/subsys/$prog ]; then
+                                        RETVAL=0
+                                        break
+                                fi
+                        fi
                 done
         else
                 RETVAL=1
@@ -75,7 +83,7 @@ case "$1" in
         start
         RETVAL=$?
         ;;
-  condrestart)
+  condrestart|try-restart|force-reload)
         if [ -f /var/lock/subsys/$prog ]; then
             stop
             start
@@ -87,7 +95,7 @@ case "$1" in
         RETVAL=$?
         ;;
   *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+        echo $"Usage: $0 {start|stop|restart|try-restart|force-reload|status}"
         exit 1
 esac
 
diff --git a/vsftpd.spec b/vsftpd.spec
index fcea3d5..9f22e28 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jiri Skala <jskala@rehat.com> - 2.2.0-4
+- modified init script to be LSB compliant
+
 * Tue Sep 08 2009 Jiri Skala <jskala@rehat.com> - 2.2.0-3
 - fixed bug messaged in RHEL-4 #479774 - Wildcard failures with vsftpd