[arch-commits] Commit in lm_sensors/repos (6 files)
Eric Bélanger
eric at archlinux.org
Tue Sep 29 06:46:19 UTC 2009
Date: Tuesday, September 29, 2009 @ 02:46:19
Author: eric
Revision: 53332
Merged revisions 53331 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/lm_sensors/trunk
........
r53331 | eric | 2009-09-29 02:46:01 -0400 (Tue, 29 Sep 2009) | 2 lines
upgpkg: lm_sensors 3.1.1-2
Fixed fancontrol daemon script (close FS#15269), Added sensord daemon script (close FS#15811)
........
Added:
lm_sensors/repos/extra-x86_64/sensord.conf
(from rev 53331, lm_sensors/trunk/sensord.conf)
lm_sensors/repos/extra-x86_64/sensord.rc
(from rev 53331, lm_sensors/trunk/sensord.rc)
Modified:
lm_sensors/repos/extra-x86_64/ (properties)
lm_sensors/repos/extra-x86_64/ChangeLog
lm_sensors/repos/extra-x86_64/PKGBUILD
lm_sensors/repos/extra-x86_64/fancontrol.rc
---------------+
ChangeLog | 6 ++++++
PKGBUILD | 26 ++++++++++++++------------
fancontrol.rc | 7 ++++---
sensord.conf | 4 ++++
sensord.rc | 37 +++++++++++++++++++++++++++++++++++++
5 files changed, 65 insertions(+), 15 deletions(-)
Property changes on: lm_sensors/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /lm_sensors/trunk:1-43525
+ /lm_sensors/trunk:1-53331
Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2009-09-29 06:46:01 UTC (rev 53331)
+++ extra-x86_64/ChangeLog 2009-09-29 06:46:19 UTC (rev 53332)
@@ -1,3 +1,9 @@
+2009-09-28 Eric Belanger <eric at archlinux.org>
+
+ * lm_sensors 3.1.1-2
+ * Fixed fancontrol daemon script (close FS#15269)
+ * Added sensord daemon script (close FS#15811)
+
2009-06-24 Eric Belanger <eric at archlinux.org>
* lm_sensors 3.1.1-1
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-09-29 06:46:01 UTC (rev 53331)
+++ extra-x86_64/PKGBUILD 2009-09-29 06:46:19 UTC (rev 53332)
@@ -4,29 +4,29 @@
pkgname=lm_sensors
pkgver=3.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring."
arch=('i686' 'x86_64')
url="http://www.lm-sensors.org/"
license=('GPL')
depends=('perl' 'sysfsutils')
-makedepends=('bison' 'flex' 'rrdtool')
+makedepends=('rrdtool')
optdepends=('rrdtool: for logging with sensord')
backup=('etc/sensors3.conf')
install=sensors.install
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
- sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc)
+ sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \
+ sensord.conf sensord.rc)
md5sums=('613d7cfa23b70c0abae3fabb0a72ff5f' 'c370f5e620bfe41113354a1e22c0c18c'\
- 'f14e335a8eea27388892c36af8099782' '47c40b381d1f25d6634ae84cecf35f33'\
+ 'b3695cd70f5cac17205a24f1249819af' '47c40b381d1f25d6634ae84cecf35f33'\
'6415014dc77365a48525901f30fe99da' 'f649261f52bd4329347bf93f5f83cb0a'\
- '970408d2e509dc4138927020efefe323')
-sha1sums=('8be15806d229305491f11b77c67496074480faf4'
- 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
- '4a5c7b9114118f66e283a728d41b5fa7fe8b551d'
- '47095a32a918d6be50bd8daa8aaa9c24940d60e9'
- '06128ebb689aa271eef916e14ae1f2c42bee1f1d'
- 'c6ddfebc20685ba69700f66038c6b00a7c0bdb80'
- 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f')
+ '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7'\
+ '41a5c20854bbff00ea7174bd2276b736')
+sha1sums=('8be15806d229305491f11b77c67496074480faf4' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\
+ '1127b042a3a167b656da74d701a6a8aa2b8f7ab4' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\
+ '06128ebb689aa271eef916e14ae1f2c42bee1f1d' 'c6ddfebc20685ba69700f66038c6b00a7c0bdb80'\
+ 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'\
+ '72a60251d1d55a67307dab4105d9f3f01a080af4')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -41,6 +41,8 @@
install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" || return 1
install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" || return 1
install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" || return 1
+ install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" || return 1
+ install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" || return 1
# remove the static lib
rm -rf "${pkgdir}/usr/lib/libsensors.a"
Modified: extra-x86_64/fancontrol.rc
===================================================================
--- extra-x86_64/fancontrol.rc 2009-09-29 06:46:01 UTC (rev 53331)
+++ extra-x86_64/fancontrol.rc 2009-09-29 06:46:19 UTC (rev 53332)
@@ -3,11 +3,12 @@
. /etc/rc.conf
. /etc/rc.d/functions
+PID=$(pidof -o %PPID /usr/sbin/fancontrol)
case "$1" in
start)
stat_busy "Starting fancontrol"
- /usr/sbin/fancontrol >/dev/null 2>&1 &
- if [ $? -gt 0 ]; then
+ [ -z "$PID" ] && /usr/sbin/fancontrol >/dev/null 2>&1 &
+ if [ -z "$PID" -o $? -gt 0 ]; then
stat_fail
else
add_daemon fancontrol
@@ -16,7 +17,7 @@
;;
stop)
stat_busy "Stopping fancontrol"
- [ -f /var/run/fancontrol.pid ] && kill `cat /var/run/fancontrol.pid`
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
Copied: lm_sensors/repos/extra-x86_64/sensord.conf (from rev 53331, lm_sensors/trunk/sensord.conf)
===================================================================
--- extra-x86_64/sensord.conf (rev 0)
+++ extra-x86_64/sensord.conf 2009-09-29 06:46:19 UTC (rev 53332)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to sensord
+#
+SENSORD_ARGS=""
Copied: lm_sensors/repos/extra-x86_64/sensord.rc (from rev 53331, lm_sensors/trunk/sensord.rc)
===================================================================
--- extra-x86_64/sensord.rc (rev 0)
+++ extra-x86_64/sensord.rc 2009-09-29 06:46:19 UTC (rev 53332)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sensord
+
+PID=$(pidof -o %PPID /usr/sbin/sensord)
+case "$1" in
+ start)
+ stat_busy "Starting sensord"
+ [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon sensord
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping sensord"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon sensord
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
More information about the arch-commits
mailing list