Drop not fully tested features from initscript. Should solve most issues.

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

4 files changed, 16 insertions, 38 deletions

diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 3819e899c77f..9618f743fb4d 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/boinc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.94 2010/11/08 17:52:35 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.95 2011/05/21 19:34:02 scarabeus Exp $
+
+  21 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> files/boinc.conf,
+  files/boinc.init:
+  Drop not fully tested features from initscript. Should solve most issues.
 
   08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
   boinc-6.10.58-r1.ebuild:
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 231550823efb..3e7e17e10601 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
-AUX boinc.init 3358 RMD160 1bbc9ce8f902534113ba9bb328b98a65877329d8 SHA1 2c804a781ba2119dceae04b9cfc75a3456db9a0b SHA256 2825646d3f0d575f548fe6999e7014a1a6212abc64eae624705a66e072dde733
+AUX boinc.conf 440 RMD160 eb56e84e0bb56d033fb1b8ff692343eb22fd6877 SHA1 7560db67952b01152f69f3caa5511d267533cc33 SHA256 bf989320e14597fc24d54a24881dafec8a141075a7da71138ca32771d66c6713
+AUX boinc.init 2810 RMD160 567d400589df0325fcaa47fca4b484d54ec35544 SHA1 85ddacd9b63ab5e95684a2b0c29c62cda441c0e6 SHA256 6860d82c1a60596f4e1db37f2b1f6b3387710060be8c1fa8f914e95263bdbd7b
 AUX generate_tarball.sh 3416 RMD160 dbf729a669586beab2d79e6f4fb1c246ad778808 SHA1 b7c8aa1f08971d8e5cfa8e2543f4d8ffc83c69ba SHA256 e5ee6e3801bd5d699da6d8acb297b076d11dab61fb6e42263720bf1393bfcafc
 DIST boinc-6.10.58.tar.bz2 11599121 RMD160 f38eeaead419fdc56d406a2293d1d2c66deed61d SHA1 cba4cefffa1aaf562ef85d1b2555de4ba28255d1 SHA256 70199b0c820bf0a40d9ec54c1be2115a5cf447f4baacc7c3b67175bca7240f42
 EBUILD boinc-6.10.58-r1.ebuild 3692 RMD160 cf4298261e3ce4338a7ee4512380a18f5f9a1b98 SHA1 e46dda58d0e7f16f9450dfe6442fb9e17109dd4f SHA256 2cb2e189e5251e8c2b84d229e9afe8c0ca678dcf563af3899129ef50871b86df
-MISC ChangeLog 17358 RMD160 490516bf1d352fa2bafefeb54af9a50380e4be0c SHA1 568f7e57132d4d592b80ef166ea9aadc068cb74a SHA256 b8f5818e09ea4a90db132e95a58a810b17d46967fc4dedc8a9b3e52202f65728
+MISC ChangeLog 17527 RMD160 e771c014c72399ddb8603931cb5e990eaa9b6918 SHA1 3dded36c68486b52c7dc2af65cf4e1dec3171c46 SHA256 db6898a588424f8c1256bb9db076260111fe945696095cc4fc416fbc4f9f8250
 MISC metadata.xml 774 RMD160 a5a2ec0c50667b20da393a2a18e63fcdc94e2eb0 SHA1 16e144f257f88c1cb7ce996aec900709096ce048 SHA256 c9024478fda0e26c17e3f324090e33dd0954cc0397802dd9872a9bdf1f733e6b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAkzYOOwACgkQIiMqcbOVdxSBaQP/SrLrnQCYfV/2e7+PAH16mQaa
-7tOBJWOMI6CG677jahAuPM6h5Fn8HdFGvfole5flfTL0t6ScqJPOSOc467PgxPBv
-bKGdDeL38vfHrvzOjGxOPWv7lyTuIjNKz7Vji4Y51Jy1UuaxcPsw8f5q9jYXzVtZ
-nfEeMDZGRRXAfJGNYgg=
-=5GDx
+iEYEARECAAYFAk3YE68ACgkQHB6c3gNBRYcrdwCgznMrkdPM817fw9kH83o8TZ6u
+RbIAoM4AXYLKW19IcPZK/K47oY9h9y8W
+=HttZ
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/boinc/files/boinc.conf b/sci-misc/boinc/files/boinc.conf
index 223b160b4b4c..827025b7da20 100644
--- a/sci-misc/boinc/files/boinc.conf
+++ b/sci-misc/boinc/files/boinc.conf
@@ -18,11 +18,3 @@ ALLOW_REMOTE_RPC="no"
 
 # nice level
 NICELEVEL="19"
-
-# scheduling parameters, arguments to chrt(1)
-SCHED_PARAM="--batch 0"
-
-# Relative CPU allocation for boinc user, default is 1024,
-# requires CONFIG_FAIR_GROUP_SCHED and CONFIG_USER_SCHED,
-# see /usr/src/linux/Documentation/scheduler/sched-design-CFS.txt
-CPU_SHARE="128"
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index 975ee83d68a9..ee772209e130 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -24,7 +24,7 @@ create_work_directory() {
 generate_logs() {
 	if [ ! -f "${LOGFILE}" ]; then
 		einfo "No ${LOGFILE} around. Creating new..."
-		einfo "For good log rotation is great tool app-admin/logrotate"
+		einfo "You really should use app-admin/logrotate for the log rotation."
 		touch "${LOGFILE}"
 		chown "${USER}:${GROUP}" "${LOGFILE}"
 	fi
@@ -40,7 +40,7 @@ cuda_check() {
 start() {
 	ebegin "Starting BOINC"
 
-	create_work_directory
+	create_work_directory || return 1
 	cuda_check
 
 	cd "${RUNTIMEDIR}"
@@ -68,14 +68,7 @@ start() {
 
 	generate_logs
 
-	# sys-apps/util-linux (setup scheduling policy if specified, otherwise blank out
-    if [ "${SCHED_PARAM}" = "" ]; then
-        CHRT=""
-    else
-    	CHRT="eval /usr/bin/chrt ${SCHED_PARAM}"
-    fi
-
-	${CHRT} start-stop-daemon \
+	start-stop-daemon \
 		--start --quiet --chdir "${RUNTIMEDIR}" \
 		--make-pidfile \
 		--pidfile "${PIDFILE}" \
@@ -85,15 +78,6 @@ start() {
 
 	RESULT=$?
 
-	if [ "${CPU_SHARE}" ] && [ -d /sys/kernel/uids ]; then
-		BUID="$(id -u "${USER}")"
-		# It might take a moment for start-stop-daemon to chuid
-		[ -d /sys/kernel/uids/"${BUID}" ] || sleep 5 # 5 was working always here
-		if [ -w /sys/kernel/uids/"${BUID}"/cpu_share ]; then
-			echo "${CPU_SHARE}" > /sys/kernel/uids/"${BUID}"/cpu_share
-		fi							      
-	fi	  
-
 	eend ${RESULT}
 }