rpms/ez-ipupdate/devel ez-ipupdate.init, 1.2, 1.3 ez-ipupdate.spec, 1.17, 1.18

[Jeff Layton (jlayton)]

Author: jlayton

Update of /cvs/extras/rpms/ez-ipupdate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12568

Modified Files:
	ez-ipupdate.init ez-ipupdate.spec 
Log Message:
Init script simplification (remove /var/lock/subsys references)
Add LSB header to init script and correct return values
Resolves BZ#246920



Index: ez-ipupdate.init
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ez-ipupdate.init	2 Jul 2006 21:16:44 -0000	1.2
+++ ez-ipupdate.init	15 Jul 2007 11:31:25 -0000	1.3
@@ -2,10 +2,17 @@
 #
 # ez-ipupdate     Starts and stops the ez-ipupdate daemon
 #
-# chkconfig: - 55 45
 #
+# chkconfig: - 55 45
 # processname: ez-ipupdate
 # description: Check and update your IP to dynamic DNS Server.
+### BEGIN INIT INFO
+# Short-Description: Check and update your IP to dynamic DNS Server
+# Provides: ez-ipupdate
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs
+# Should-Start: $time
+### END INIT INFO
 
 ez_configdir=/etc/ez-ipupdate
 ez_piddir=/var/run/ez-ipupdate
@@ -37,10 +44,8 @@
 	    ez_name=`basename $ez_configfile .conf`
 	    echo -n $"Starting $prog for $ez_name: "
 	    daemon $ez_bin --daemon --config-file $ez_configfile --pid-file $ez_piddir/$ez_name.pid
-	    error=$?
+	    [ $? -ne 0 ] && RETVAL=1
 	    echo
-	    [ $error -eq 0 ] && touch /var/lock/subsys/$prog-$ez_name
-	    [ $RETVAL -eq 0 ] && RETVAL=$error
 	fi
     done
 }
@@ -52,10 +57,8 @@
 	    ez_name=`basename $pidfile .pid`
 	    echo -n $"Shutting down $prog for $ez_name: "
 	    killproc -p $pidfile $prog -QUIT
-	    error=$?
+    	    [ $? -ne 0 ] && RETVAL=1
 	    echo
-    	    [ $error -eq 0 ] && rm -f /var/lock/subsys/$prog-$ez_name && rm -f $ez_piddir/$ez_name
-	    [ $RETVAL -eq 0 ] && RETVAL=$error
 	fi
     done
 }
@@ -67,16 +70,14 @@
 	    ez_name=`basename $pidfile .pid`
 	    echo -n $"Reloading $prog for $ez_name: "
 	    killproc -p $pidfile $prog -HUP
-	    error=$?
-	    [ $RETVAL -eq 0 ] && RETVAL=$error
+	    [ $? -ne 0 ] && RETVAL=1
 	    echo
 	fi
     done
 }
 
 restart() {
-    stop
-    start
+    stop && start
     RETVAL=$?
 }
 
@@ -95,7 +96,7 @@
     reload
     ;;
   condrestart|try-restart)
-    ls /var/lock/subsys/$prog-* 1>/dev/null 2>&1 && restart
+    ls ${ez_piddir}/*.pid >/dev/null && restart
     ;;
   status)
     status $prog


Index: ez-ipupdate.spec
===================================================================
RCS file: /cvs/extras/rpms/ez-ipupdate/devel/ez-ipupdate.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ez-ipupdate.spec	17 Jun 2007 00:42:09 -0000	1.17
+++ ez-ipupdate.spec	15 Jul 2007 11:31:25 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           ez-ipupdate
 Version:        3.0.11
-Release:        0.14.b8%{?dist}
+Release:        0.15.b8%{?dist}
 Summary:        Client for Dynamic DNS Services
 
 Group:          Applications/Internet
@@ -118,6 +118,10 @@
 %ghost %attr(0640,root,ez-ipupd) %config(noreplace,missingok) %{_sysconfdir}/ez-ipupdate/default.conf
 
 %changelog
+* Sun Jul 15 2007 Jeff Layton <jlayton at redhat.com> - 3.0.11-0.15.b8
+- initscript: add LSB header and fix return values
+- initscript: remove /var/lock/subsys references
+
 * Fri Jun 15 2007 J. Randall Owens <jrowens at ghiapet.homeip.net> - 3.0.11-0.14.b8
 - fix doc directory permissions