rpms/vsftpd/devel vsftpd.init,1.6,1.7 vsftpd.spec,1.99,1.100

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30916

Modified Files:
	vsftpd.init vsftpd.spec 
Log Message:
* Mon Sep 14 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-4
- modified init script to be LSB compliant



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vsftpd.init	21 May 2009 05:53:01 -0000	1.6
+++ vsftpd.init	15 Sep 2009 12:18:06 -0000	1.7
@@ -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
 


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- vsftpd.spec	8 Sep 2009 11:05:03 -0000	1.99
+++ vsftpd.spec	15 Sep 2009 12:18:06 -0000	1.100
@@ -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 at rehat.com> - 2.2.0-4
+- modified init script to be LSB compliant
+
 * Tue Sep 08 2009 Jiri Skala <jskala at rehat.com> - 2.2.0-3
 - fixed bug messaged in RHEL-4 #479774 - Wildcard failures with vsftpd