Drop initd checks as irqbalance itself does it #162975 by J.Taimr.

Package-Manager: portage-2.1.2-r1

5 files changed, 42 insertions, 35 deletions

diff --git a/sys-apps/irqbalance/ChangeLog b/sys-apps/irqbalance/ChangeLog
index abcc4e70fd80..e6f19f004cd9 100644
--- a/sys-apps/irqbalance/ChangeLog
+++ b/sys-apps/irqbalance/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/irqbalance
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/ChangeLog,v 1.15 2007/01/09 04:13:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/ChangeLog,v 1.16 2007/01/21 19:07:25 vapier Exp $
+
+  21 Jan 2007; Mike Frysinger <vapier@gentoo.org> +files/irqbalance.confd,
+  files/irqbalance.init, irqbalance-0.55.ebuild:
+  Drop initd checks as irqbalance itself does it #162975 by J.Taimr.
 
   09 Jan 2007; Mike Frysinger <vapier@gentoo.org> files/irqbalance.init:
   Abort loading on uniproc/dualcore machines. Only want to run on real SMP
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 53de82590510..0bea816b726f 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -5,24 +5,28 @@ AUX irqbalance-0.55-build.patch 855 RMD160 3908e87bbbb673aa1ccc9b0be1ba261b96083
 MD5 3264033f7ac988657a213d06763a8ea5 files/irqbalance-0.55-build.patch 855
 RMD160 3908e87bbbb673aa1ccc9b0be1ba261b960831cc files/irqbalance-0.55-build.patch 855
 SHA256 ddbc077d45137fec1497aa6fb3a0bb60d5af8c76721c59446acf53a17b4a57e2 files/irqbalance-0.55-build.patch 855
-AUX irqbalance.init 1223 RMD160 846c6fd887ea412b66f37bee24f8f50570586b37 SHA1 7534881f20b9e2b0b746d62ccbcaf75998aee5eb SHA256 e0ae2e3bddcc5d46b2c7c981f8bb3381c4227c8a142bb3dc75c815450ca28c66
-MD5 30846e037327c63a37a560e42265799a files/irqbalance.init 1223
-RMD160 846c6fd887ea412b66f37bee24f8f50570586b37 files/irqbalance.init 1223
-SHA256 e0ae2e3bddcc5d46b2c7c981f8bb3381c4227c8a142bb3dc75c815450ca28c66 files/irqbalance.init 1223
+AUX irqbalance.confd 438 RMD160 6e784d7cd6c6ecc1822f9e465506eb4e946cc719 SHA1 dd38cfe4e42becb91ed71d278368ec8d1ded6db7 SHA256 d03ebf310c27acac159e36db1e7fb2dc75d2ef69a860aaffa1f942dc2fc60c4e
+MD5 780eb0c2a0a5acd48db155d5f9f3ee74 files/irqbalance.confd 438
+RMD160 6e784d7cd6c6ecc1822f9e465506eb4e946cc719 files/irqbalance.confd 438
+SHA256 d03ebf310c27acac159e36db1e7fb2dc75d2ef69a860aaffa1f942dc2fc60c4e files/irqbalance.confd 438
+AUX irqbalance.init 585 RMD160 b400d11e5aa5e23779b2aaa3b3c5d8c58af32a63 SHA1 4f1e5926062b4768cbf621652e86090d46bdc338 SHA256 27c30e3a36ad19b441ef97da5bc9e499b00e1ec140cfef014743b355386284f2
+MD5 f64333772a7e20bc3152da02c0b1b4c4 files/irqbalance.init 585
+RMD160 b400d11e5aa5e23779b2aaa3b3c5d8c58af32a63 files/irqbalance.init 585
+SHA256 27c30e3a36ad19b441ef97da5bc9e499b00e1ec140cfef014743b355386284f2 files/irqbalance.init 585
 DIST irqbalance-0.12.tar.gz 10899 RMD160 d3ad35fb10cde5687577a23f7df85a92afabee64 SHA1 ac9c810f5acb5b84cb929158bc58e7378f7e0044 SHA256 a718012d43de9b635289b13482621919411a3f5e0decfb8b02124c064734f225
 DIST irqbalance-0.55.tar.gz 20637 RMD160 099b9bb1c6774f518b967c2cbbd418812f2f576c SHA1 9073e1dbb48e7c7bf1f4850e988d8f74e8a35761 SHA256 489955ea58b713f5d7aaa23752818270a4834b4f09d121bd78a4e5509e359f01
 EBUILD irqbalance-0.12-r1.ebuild 896 RMD160 df4558803ce44fe87dc814d54a5a93340cf401cf SHA1 2c3913bef660cd83e0071d8196122a177d0d524f SHA256 25327dd9ced10432c4595a89fee93e29b7defb7f3b01c04e423162b8fe518e31
 MD5 fa58c60f09e37318e0d7f22898270ffb irqbalance-0.12-r1.ebuild 896
 RMD160 df4558803ce44fe87dc814d54a5a93340cf401cf irqbalance-0.12-r1.ebuild 896
 SHA256 25327dd9ced10432c4595a89fee93e29b7defb7f3b01c04e423162b8fe518e31 irqbalance-0.12-r1.ebuild 896
-EBUILD irqbalance-0.55.ebuild 717 RMD160 2fa8219ac31a27407071a88f03cbd606c6057733 SHA1 39ec54ad193f675d02056830b4e930ea2e95c19d SHA256 0535714bb11ff995c382c06ae4972df4cf95551ecce18e26a3a73489075e802a
-MD5 8a0c8ac007ef63ed59138d50c8da3782 irqbalance-0.55.ebuild 717
-RMD160 2fa8219ac31a27407071a88f03cbd606c6057733 irqbalance-0.55.ebuild 717
-SHA256 0535714bb11ff995c382c06ae4972df4cf95551ecce18e26a3a73489075e802a irqbalance-0.55.ebuild 717
-MISC ChangeLog 2319 RMD160 8d8254dbbb4237515e315b2a68fcbd7328991bbc SHA1 9cff29afdb5d4b9268cea12939f9ebad513d6a18 SHA256 c7d94dea7eadbfae8bf10ea445553b611e47b9f18da133729e16c44f59728f3a
-MD5 aa6f5c0adfc06e683c50ede6e24cfbd2 ChangeLog 2319
-RMD160 8d8254dbbb4237515e315b2a68fcbd7328991bbc ChangeLog 2319
-SHA256 c7d94dea7eadbfae8bf10ea445553b611e47b9f18da133729e16c44f59728f3a ChangeLog 2319
+EBUILD irqbalance-0.55.ebuild 770 RMD160 b9d7c3687b558b8e4c3e5cf9b9fcfd963a961f8c SHA1 50c9cce3a2e8798c96a0ceb804765af9adcddcf2 SHA256 4f82214bb48bb726636f974dfcab3619c913c932809dd5d359e7d4d939d90843
+MD5 5a22cfd493e99d69f8ca62362e67c269 irqbalance-0.55.ebuild 770
+RMD160 b9d7c3687b558b8e4c3e5cf9b9fcfd963a961f8c irqbalance-0.55.ebuild 770
+SHA256 4f82214bb48bb726636f974dfcab3619c913c932809dd5d359e7d4d939d90843 irqbalance-0.55.ebuild 770
+MISC ChangeLog 2513 RMD160 b98705775028c9434be6496211f50e9c9dddef27 SHA1 a6b30e37b052b4cb88a226d37187fcdd7c553c0c SHA256 5ea4b8138df6640b11be0fc0c871d2819f766b4c561a58592abd09982467b1be
+MD5 7afed223cd6e38fceec4bf4f1a983678 ChangeLog 2513
+RMD160 b98705775028c9434be6496211f50e9c9dddef27 ChangeLog 2513
+SHA256 5ea4b8138df6640b11be0fc0c871d2819f766b4c561a58592abd09982467b1be ChangeLog 2513
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -36,7 +40,7 @@ SHA256 649ed38002f6f4193d5249918cdf794d694c23f65b92b64edece4125c9eeab95 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFoxaG8bi6rjpTunYRAsK4AJ4voAgOAa21V/NwktMEJQrofLoPRACdFMCT
-9whbfUqnUrs5BK4VKh46aK8=
-=d2mc
+iD8DBQFFs7oH8bi6rjpTunYRAgNvAJ4mBXMWaPAvrbtC6TxuKzW+U5MKOACgwrep
+vzJv2OZVqXJ+Vvh1jRGE9as=
+=+NTH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/irqbalance/files/irqbalance.confd b/sys-apps/irqbalance/files/irqbalance.confd
new file mode 100644
index 000000000000..152dd7988652
--- /dev/null
+++ b/sys-apps/irqbalance/files/irqbalance.confd
@@ -0,0 +1,15 @@
+# /etc/conf.d/irqbalance: config file for /etc/init.d/irqbalance
+# These are envvars used by irqbalance itself.  For more info,
+# please see the irqbalance manpage.
+
+# Run irqbalance once and then exit
+#IRQBALANCE_ONESHOT="0"
+
+# Include debug messages in output
+#IRQBALANCE_DEBUG="0"
+
+# List of cpus to not include in balancing
+#IRQBALANCE_BANNED_CPUS=""
+
+# List of interrupts to not include in balancing
+#IRQBALANCE_BANNED_INTERRUPTS=""
diff --git a/sys-apps/irqbalance/files/irqbalance.init b/sys-apps/irqbalance/files/irqbalance.init
index f311b2c22569..18b051931238 100755
--- a/sys-apps/irqbalance/files/irqbalance.init
+++ b/sys-apps/irqbalance/files/irqbalance.init
@@ -1,31 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/files/irqbalance.init,v 1.2 2007/01/09 04:13:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/files/irqbalance.init,v 1.3 2007/01/21 19:07:25 vapier Exp $
 
 depend() {
 	need localmount
 	after bootmisc
 }
 
-checkconfig() {
-	# irqbalance only makes sense to run on smp machines
-	# where each cpu has its own cache ... so if you're
-	# just running a dual core machine, you've got shared
-	# cache, so we'll abort here.
-	local physical_ids=$(grep -s '^physical id[[:space:]]*:' /proc/cpuinfo | sort -u | wc -l)
-	[[ ${physical_ids} -gt 1 ]] && return 0
-	[[ ${physical_ids} -eq 1 ]] && return 1
-	local processors=$(grep -s '^processor[[:space:]]*:' /proc/cpuinfo | sort -u | wc -l)
-	[[ ${processors} -gt 1 ]] && return 0
-}
-
 start() {
-	if ! checkconfig ; then
-		eerror "irqbalance: your machine lacks different physical processors; not enabling"
-		return 1
-	fi
-
 	ebegin "Starting irqbalance"
 	start-stop-daemon --start --exec /sbin/irqbalance \
 	        --pidfile /var/run/irqbalance.pid
diff --git a/sys-apps/irqbalance/irqbalance-0.55.ebuild b/sys-apps/irqbalance/irqbalance-0.55.ebuild
index d016772737e9..d747881fa98d 100644
--- a/sys-apps/irqbalance/irqbalance-0.55.ebuild
+++ b/sys-apps/irqbalance/irqbalance-0.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-0.55.ebuild,v 1.2 2007/01/09 02:28:22 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-0.55.ebuild,v 1.3 2007/01/21 19:07:25 vapier Exp $
 
 inherit eutils
 
@@ -25,4 +25,5 @@ src_install() {
 	into /
 	dosbin irqbalance || die "dosbin failed"
 	newinitd "${FILESDIR}"/irqbalance.init irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd irqbalance
 }