rpms/boinc-client/F-9 boinc-client-init-d, 1.2, 1.3 boinc-client.spec, 1.6, 1.7

[Miloš Jakubíček (mjakubicek)]

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8682/F-9

Modified Files:
	boinc-client-init-d boinc-client.spec 
Log Message:
- Fixed handling stale lockfiles (#444936).
- Initscript fixed to be compliant with current SysVInit guidelines
  (added condrestart, try-restart, force-reload actions).




Index: boinc-client-init-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client-init-d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- boinc-client-init-d	14 Apr 2008 09:14:36 -0000	1.2
+++ boinc-client-init-d	3 May 2008 19:09:23 -0000	1.3
@@ -98,7 +98,7 @@
         function echo_success () { echo -n "	[  OK  ]  " ; }
         function echo_failure () { echo -n "	[FAILED]  " ; }
         function echo_warning () { echo -n "	[WARNING] " ; }
-	function killproc() {
+		function killproc() {
 	     PID=`pidof -s -x -o $$ -o $PPID -o %PPID $1` 
 	     [ $PID ] && kill $PID ; }
 fi
@@ -155,21 +155,14 @@
   start)
         cd $BOINCDIR
 
-        if [ -f lockfile ] ; then
-          echo -n "Another instance of BOINC is running (lockfile exists)."
-          echo_success
-          echo 
-          exit
-        fi
-
         if [ ! -d projects ] ; then
-          echo -n "The BOINC client requires initialization."
+          echo -n "The BOINC client requires initialization (no projects attached)."
           echo_warning
           echo 
         fi
 
         echo -n "Starting BOINC client as a daemon:  "
-        daemon --user $BOINCUSER "$BOINCEXE $BOINCOPTS" >>$LOGFILE 2>>$ERRORLOG &
+        daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE $BOINCOPTS" >>$LOGFILE 2>>$ERRORLOG &
         sleep 1  
         PID=`pidof -s -x -o $$ -o $PPID -o %PPID $BOINCEXE`
         if [ $PID ]; then
@@ -196,10 +189,19 @@
           echo -n "BOINC is not running (no lockfiles found) -- starting service."
 	  $0 start
   	else
-  	  $BOINCCMD --read_cc_config >>$LOGFILE 2>>$ERRORLOG && echo_success || $0 restart
+		echo -n "Reading configuration: "
+  	  $BOINCCMD --read_cc_config >>$LOGFILE 2>>$ERRORLOG && echo_success || echo_failure
 	fi
 	echo
 	;;
+  force-reload)
+  		$0 reload
+		$0 restart
+  		;;
+  condrestart|try-restart)
+  		$0 status || exit 0
+		$0 restart
+  		;;
   restart)
         $0 stop
         $0 start
@@ -224,8 +226,8 @@
         ;;
 
   *)
-        echo "Usage: boinc {start|stop|restart|reload|status}"
-        exit 1
+        echo "Usage: boinc {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+        exit 2
 esac
 
 exit


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- boinc-client.spec	23 Apr 2008 07:47:53 -0000	1.6
+++ boinc-client.spec	3 May 2008 19:09:23 -0000	1.7
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	5.10.45
-Release:	9.%{snap}svn%{?dist}
+Release:	10.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -262,8 +262,13 @@
 %{_includedir}/BOINC/*
 
 %changelog
+* Sat May 03 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 5.10.45-10.20080315svn
+- Fixed handling stale lockfiles (#444936).
+- Initscript fixed to be compliant with current SysVInit guidelines
+  (added condrestart, try-restart, force-reload actions).
+
 * Wed Apr 23 2008 Lubomir Kundrak <lkundrak at redhat.com> - 5.10.45-9.20080315svn
-- Do not expect chown of nonexistent files to succeed
+- Do not expect chown of nonexistent files to succeed (#443568)
 
 * Mon Apr 14 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 5.10.45-8.20080315svn
 - Fixed projects permissions (calling chown recursively).