aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2012-05-14 09:47:28 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2012-05-14 09:47:28 +0000
commit3ac481393d3f31caa030b9499d4f9c8d04ce783c (patch)
treee4bf3691273f62d80b14dcb3978f5c9ca7eded72 /testing
parent3ebd91d5127e1d92d79a45337058b6a5df7ca306 (diff)
downloadaports-3ac481393d3f31caa030b9499d4f9c8d04ce783c.tar.bz2
aports-3ac481393d3f31caa030b9499d4f9c8d04ce783c.tar.xz
testing/irqbalance: fix init script and conf
Diffstat (limited to 'testing')
-rw-r--r--testing/irqbalance/APKBUILD6
-rw-r--r--testing/irqbalance/irqbalance.confd268
-rw-r--r--testing/irqbalance/irqbalance.initd21
3 files changed, 32 insertions, 263 deletions
diff --git a/testing/irqbalance/APKBUILD b/testing/irqbalance/APKBUILD
index 10c93306c1..be48a2d719 100644
--- a/testing/irqbalance/APKBUILD
+++ b/testing/irqbalance/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=irqbalance
pkgver=1.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="Daemon that distributes interrupts over the processors"
url="http://code.google.com/p/irqbalance/"
arch="all"
@@ -40,5 +40,5 @@ package() {
}
md5sums="6f246481d6295bcb9a79751c03207c96 irqbalance-1.0.3.tar.gz
-28bf0fc27fac03780629c750aa56c193 irqbalance.confd
-dff518700052556165969764843770bd irqbalance.initd"
+731fa9a46bc4fa380604bfb76d96d1ed irqbalance.confd
+9f698ab4001d7eb8e83eae36da65535d irqbalance.initd"
diff --git a/testing/irqbalance/irqbalance.confd b/testing/irqbalance/irqbalance.confd
index e95a8339ba..2761cfcd35 100644
--- a/testing/irqbalance/irqbalance.confd
+++ b/testing/irqbalance/irqbalance.confd
@@ -1,261 +1,19 @@
+# /etc/conf.d/irqbalance: config file for /etc/init.d/irqbalance
+# Additional options to pass to irqbalance itself.
+IRQBALANCE_OPTS=""
+# These are envvars used by irqbalance itself, so make sure the "export"
+# is retained. For more info, please see the irqbalance manpage.
+# Run irqbalance once and then exit
+#export IRQBALANCE_ONESHOT="0"
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!-- ViewVC :: http://www.viewvc.org/ -->
-<head>
-<title>[gentoo-x86] Log of /sys-apps/irqbalance/files/irqbalance.confd-1</title>
-<meta name="generator" content="ViewVC 1.1.12" />
-<link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon" />
-<link rel="stylesheet" href="/static/styles.css" type="text/css" />
-
-</head>
-<body>
-<div class="vc_navheader">
-<table><tr>
-<td><strong><a href="/cgi-bin/viewvc.cgi"><span class="pathdiv">/</span></a><a href="/cgi-bin/viewvc.cgi/gentoo-x86/">[gentoo-x86]</a><span class="pathdiv">/</span><a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/">sys-apps</a><span class="pathdiv">/</span><a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/">irqbalance</a><span class="pathdiv">/</span><a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/">files</a><span class="pathdiv">/</span>irqbalance.confd-1</strong></td>
-<td style="text-align: right;">
-</td>
-</tr></table>
-</form>
-</div>
-<div style="float: right; padding: 5px;"><a href="http://www.gentoo.org/" title="Gentoo Linux"><img src="/static/images/gentoo-new.gif" alt="Gentoo" width="182" height="59" /></a></div>
-<h1>Log of /sys-apps/irqbalance/files/irqbalance.confd-1</h1>
-
-<p style="margin:0;">
-
-<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/"><img src="/static/images/back_small.png" class="vc_icon" alt="Parent Directory" /> Parent Directory</a>
-
-| <a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?view=log"><img src="/static/images/log.png" class="vc_icon" alt="Revision Log" /> Revision Log</a>
-
-
-
-
-</p>
-
-<hr />
-<table class="auto">
-
-
-
-<tr>
-<td>Links to HEAD:</td>
-<td>
-(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?view=markup">view</a>)
-(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1">download</a>)
-
-(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?view=annotate">annotate</a>)
-</td>
-</tr>
-
-
-
-</table>
-
-
-
-
-
-
-
-
-<div>
-<hr />
-
-<a name="rev1.1"></a>
-<a name="HEAD"></a>
-
-
-Revision <strong>1.1</strong> -
-
-
-(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?revision=1.1&amp;view=markup">view</a>)
-
-
-(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?revision=1.1">download</a>)
-
-(<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?annotate=1.1">annotate</a>)
-
-
-
-- <a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?r1=1.1&amp;view=log">[select for diffs]</a>
-
-
-
-
-<br />
-
-<em>Sat Nov 5 17:59:25 2011 UTC</em>
-(6 months, 1 week ago)
-by <em>vapier</em>
-
-
-<br />Branch:
-
-<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?view=log&amp;pathrev=MAIN"><strong>MAIN</strong></a>
-
-
-
-<br />CVS Tags:
-
-<a href="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1?view=log&amp;pathrev=HEAD"><strong>HEAD</strong></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<pre class="vc_log">Version bump, and improve init.d #383955 by Pacho Ramos.
-
-(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
-
-</pre>
-</div>
-
-
-
-
- <hr />
-<p><a name="diff"></a>
-This form allows you to request diffs between any two revisions of this file.
-For each of the two "sides" of the diff,
-
-select a symbolic revision name using the selection box, or choose
-'Use Text Field' and enter a numeric revision.
-
-</p>
-<form method="get" action="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1" id="diff_select">
-<table cellpadding="2" cellspacing="0" class="auto">
-<tr>
-<td>&nbsp;</td>
-<td>
-<input type="hidden" name="view" value="diff"/>
-Diffs between
-
-<select name="r1">
-<option value="text" selected="selected">Use Text Field</option>
-
-<option value="1.1:MAIN">MAIN</option>
-
-<option value="1.1:HEAD">HEAD</option>
-
-</select>
-<input type="text" size="12" name="tr1"
-value="1.1"
-onchange="document.getElementById('diff_select').r1.selectedIndex=0" />
-
-and
-
-<select name="r2">
-<option value="text" selected="selected">Use Text Field</option>
-
-<option value="1.1:MAIN">MAIN</option>
-
-<option value="1.1:HEAD">HEAD</option>
-
-</select>
-<input type="text" size="12" name="tr2"
-value="1.1"
-onchange="document.getElementById('diff_select').r2.selectedIndex=0" />
-
-</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-<td>
-Type of Diff should be a
-<select name="diff_format" onchange="submit()">
-<option value="h" selected="selected">Colored Diff</option>
-<option value="l" >Long Colored Diff</option>
-<option value="f" >Full Colored Diff</option>
-<option value="u" >Unidiff</option>
-<option value="c" >Context Diff</option>
-<option value="s" >Side by Side</option>
-</select>
-<input type="submit" value=" Get Diffs " />
-</td>
-</tr>
-</table>
-</form>
-
-
-
-<form method="get" action="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1">
-<div>
-<hr />
-<a name="logsort"></a>
-<input type="hidden" name="view" value="log"/>
-Sort log by:
-<select name="logsort" onchange="submit()">
-<option value="cvs" >Not sorted</option>
-<option value="date" selected="selected">Commit date</option>
-<option value="rev" >Revision</option>
-</select>
-<input type="submit" value=" Sort " />
-</div>
-</form>
-
-<br>
-<tr>
-<td>Sticky Tag:</td>
-<td><form method="get" action="/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/irqbalance/files/irqbalance.confd-1" style="display: inline">
-<div style="display: inline">
-<input type="hidden" name="view" value="log"/>
-
-
-<select name="pathrev" onchange="submit()">
-<option value=""></option>
-
-<optgroup label="Branches">
-
-
-<option>MAIN</option>
-
-
-</optgroup>
-
-<optgroup label="Non-branch tags">
-
-
-<option>HEAD</option>
-
-
-</optgroup>
-
-</select>
-
-<input type="submit" value="Set" />
-</div>
-</form>
-
-</td>
-</tr>
-
-<hr />
-<table>
-<tr>
-<td>&nbsp;</td>
-<td style="text-align: right;"><strong><a href="/static/help_log.html">ViewVC Help</a></strong></td>
-</tr>
-<tr>
-<td>Powered by <a href="http://viewvc.tigris.org/">ViewVC 1.1.12</a></td>
-<td style="text-align: right;">&nbsp;</td>
-</tr>
-</table>
-</body>
-</html>
+# Include debug messages in output
+#export IRQBALANCE_DEBUG="0"
+# List of cpus to not include in balancing
+#export IRQBALANCE_BANNED_CPUS=""
+# List of interrupts to not include in balancing
+#export IRQBALANCE_BANNED_INTERRUPTS=""
diff --git a/testing/irqbalance/irqbalance.initd b/testing/irqbalance/irqbalance.initd
index c27a32f27f..df7daf74dc 100644
--- a/testing/irqbalance/irqbalance.initd
+++ b/testing/irqbalance/irqbalance.initd
@@ -1,12 +1,23 @@
#!/sbin/runscript
# Copyright 1999-2012 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.2,v 1.1 2012/04/06 18:03:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/files/irqbalance.init,v 1.5 2012/01/07 22:04:49 vapier Exp $
depend() {
- need localmount
- after bootmisc
}
-command="/usr/sbin/irqbalance"
-command_args="${IRQBALANCE_OPTS}"
+ssd() {
+ start-stop-daemon --exec /usr/sbin/irqbalance "$@"
+}
+
+start() {
+ ebegin "Starting irqbalance"
+ ssd --start -- ${IRQBALANCE_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping irqbalance"
+ ssd --stop
+ eend $?
+}