rpms/mcstrans/devel mcstrans-0.3.1-init.patch, NONE, 1.1 mcstrans.spec, 1.43, 1.44

[Miroslav Grepl]

Author: mgrepl

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

Modified Files:
	mcstrans.spec 
Added Files:
	mcstrans-0.3.1-init.patch 
Log Message:
- Fix init script



mcstrans-0.3.1-init.patch:
 mcstrans.init |   22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

--- NEW FILE mcstrans-0.3.1-init.patch ---
--- mcstrans-0.3.1/src/mcstrans.init~	2009-09-16 11:01:17.646738932 +0200
+++ mcstrans-0.3.1/src/mcstrans.init	2009-09-16 11:23:47.605763983 +0200
@@ -20,6 +20,7 @@
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 prog="mcstransd"
+lockfile=/var/lock/subsys/$prog
 
 # Source function library.
 . /etc/init.d/functions
@@ -54,7 +55,7 @@
 	RETVAL=$?
 	echo
 	if test $RETVAL = 0 ; then
-        	touch /var/lock/subsys/mcstrans
+        	touch $lockfile
 	fi
 	return $RETVAL
 }
@@ -64,15 +65,7 @@
 	killproc $prog
 	RETVAL=$?
 	echo
-	rm -f /var/lock/subsys/mcstrans
-	return $RETVAL
-}
-
-reload(){
-	echo -n $"Reloading configuration: "	
-	killproc $prog -HUP
-	RETVAL=$?
-	echo
+	rm -f $lockfile
 	return $RETVAL
 }
 
@@ -82,7 +75,7 @@
 }
 
 condrestart(){
-	[ -e /var/lock/subsys/mcstrans ] && restart
+	[ -e $lockfile ] && restart
 	return 0
 }
 
@@ -95,17 +88,14 @@
     stop)
 	stop
 	;;
-    restart)
+    restart|force-reload)
 	restart
 	;;
-    reload)
-	reload
-	;;
     condrestart)
 	condrestart
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|rotate}"
+	echo $"Usage: $0 {start|stop|status|restart|force-reload|condrestart}"
 	RETVAL=3
 esac
 


Index: mcstrans.spec
===================================================================
RCS file: /cvs/extras/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- mcstrans.spec	25 Jul 2009 11:55:35 -0000	1.43
+++ mcstrans.spec	17 Sep 2009 09:44:36 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
 Version: 0.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL+
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
@@ -13,6 +13,7 @@ Requires(pre): /sbin/chkconfig /sbin/ser
 Requires(post):/sbin/chkconfig /sbin/service
 Provides: setransd
 Provides: libsetrans
+Patch: mcstrans-0.3.1-init.patch
 Obsoletes: libsetrans
 
 %description
@@ -31,6 +32,7 @@ from internal representations to user de
 
 %prep
 %setup -q
+%patch -p1 
 
 %build
 make clean
@@ -53,8 +55,8 @@ rm -rf %{buildroot}
 
 %post 
 chkconfig --add mcstrans
-if [ -f /var/lock/subsys/mcstransd ]; then
-   mv /var/lock/subsys/mcstransd /var/lock/subsys/mcstrans
+if [ -f /var/lock/subsys/mcstrans ]; then
+   mv /var/lock/subsys/mcstrans /var/lock/subsys/mcstransd
 fi
 
 %preun
@@ -86,6 +88,9 @@ fi
 %{_usr}/share/mcstrans/util/*
 
 %changelog
+* Thu Sep 17 2009 Miroslav Grepl <mgrepl at redhat.com> 0.3.1-3
+- Fix init script
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild