rpms/boinc-client/devel boinc-client-init-d, 1.3, 1.4 boinc-client.spec, 1.13, 1.14
Miloš Jakubíček (mjakubicek)
fedora-extras-commits at redhat.com
Mon Aug 4 21:04:09 UTC 2008
Author: mjakubicek
Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23369
Modified Files:
boinc-client-init-d boinc-client.spec
Log Message:
- Fixed return value when managing the daemon with insufficient rights to 4
according to the guidelines.
- There is now a delay up to 10 seconds when starting the service to check
that it is up.
- Fixed boinc platform on PPC/PPC64.
Index: boinc-client-init-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client-init-d,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boinc-client-init-d 3 May 2008 19:08:05 -0000 1.3
+++ boinc-client-init-d 4 Aug 2008 21:03:39 -0000 1.4
@@ -152,8 +152,8 @@
## Functions: $1 is one of start|stop|status|reload|restart
case "$1" in
- start)
- cd $BOINCDIR
+ start)
+ cd $BOINCDIR
if [ ! -d projects ] ; then
echo -n "The BOINC client requires initialization (no projects attached)."
@@ -162,11 +162,29 @@
fi
echo -n "Starting BOINC client as a daemon: "
- 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
- touch $LOCKFILE && echo_success || echo_failure
+
+ # Check that we're a privileged user
+ if [ `id -u` != 0 ] ; then
+ echo -n "Insufficient rights."
+ echo_failure
+ echo
+ exit 4
+ fi
+
+ daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE $BOINCOPTS" >>$LOGFILE 2>>$ERRORLOG &
+ try=0
+ while [ $try -lt 10 ] ; do
+ PID=`pidof -s -x -o $$ -o $PPID -o %PPID $BOINCEXE`
+ if [ $PID ]; then
+ touch $LOCKFILE && echo_success || echo_failure
+ break
+ else
+ sleep 1
+ fi
+ let try+=1
+ done;
+ if [ -z $PID ]; then
+ echo_failure
fi
echo
;;
Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- boinc-client.spec 17 May 2008 11:06:15 -0000 1.13
+++ boinc-client.spec 4 Aug 2008 21:03:39 -0000 1.14
@@ -107,12 +107,21 @@
%build
%ifarch i386
-%configure --disable-static --enable-unicode --with-boinc-platform=i686-pc-linux-gnu STRIP=:
+%define boinc_platform i686-pc-linux-gnu
+%endif
+%ifarch powerpc ppc
+%define boinc_platform powerpc-linux-gnu
+%endif
+%ifarch powerpc64 ppc64
+%define boinc_platform ppc64-linux-gnu
+%endif
+
+%if %{defined boinc_platform}
+%configure --disable-static --enable-unicode --with-boinc-platform=%{boinc_platform} STRIP=:
%else
%configure --disable-static --enable-unicode STRIP=:
%endif
-
# Parallel make does not work.
make -k
@@ -269,6 +278,13 @@
%{_includedir}/BOINC/*
%changelog
+* Mon Aug 04 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 5.10.45-15.20080315svn
+- Fixed return value when managing the daemon with insufficient rights to 4
+ according to the guidelines.
+- There is now a delay up to 10 seconds when starting the service to check
+ that it is up.
+- Fixed boinc platform on PPC/PPC64.
+
* Sat May 17 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 5.10.45-14.20080315svn
- Fixed opening locales by adding boinc-locales.patch
More information about the scm-commits
mailing list