rpms/inadyn/devel inadyn.init,1.3,1.4 inadyn.spec,1.6,1.7

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/inadyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6313

Modified Files:
	inadyn.init inadyn.spec 
Log Message:

 
 Description:

   Use /sbin/service in scriptlets.
   Modify initscript becouse bash don't get PID.




Index: inadyn.init
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inadyn.init	28 Apr 2005 14:31:11 -0000	1.3
+++ inadyn.init	3 May 2005 15:43:42 -0000	1.4
@@ -32,10 +32,9 @@
     # Start daemons.
     echo -n $"Starting $prog: "
     daemon $ina_bin
-    PID=$!
     RETVAL=$?
     echo
-    [ $RETVAL -eq 0 ] && echo "$PID" >$ina_pid && touch /var/lock/subsys/$prog
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
 }
 
 stop() {


Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inadyn.spec	28 Apr 2005 14:31:11 -0000	1.6
+++ inadyn.spec	3 May 2005 15:43:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           inadyn
 Version:        1.90
-Release:        8
+Release:        9
 Summary:        Dynamic DNS Client
 
 Group:          System Environment/Daemons
@@ -12,7 +12,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/chkconfig
+Requires(post):  /sbin/service
 Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
 
 %description
 INADYN is a dynamic DNS client. It maintains the IP address of a
@@ -56,13 +58,13 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-  %{_initrddir}/inadyn stop >/dev/null 2>&1 || :
+  /sbin/service inadyn stop >/dev/null 2>&1 || :
   /sbin/chkconfig --del inadyn
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-  %{_initrddir}/inadyn condrestart >/dev/null
+  /sbin/service inadyn condrestart >/dev/null
 fi
 
 %files
@@ -74,6 +76,10 @@
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Tue May  3 2005 Jochen Schmitt <Jochen herr-schmitt de> 1.90-9
+- Use of /sbin/service to manage initscript in scriptlet
+- Modify initscript, becouse bash don't return PID
+
 * Thu Apr 28 2005 Jochen Schmitt <Jochen herr-schmitt.de> 1.90-8
 - Replace ez_pid to ina_pid in initscript