rpms/lm_sensors
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Enhancing the sensord service wrapper (#863986)

Browse Source 
- UsrMove and libexec path tunings
This commit is contained in:
Jaromir Capik 2014-01-10 14:46:42 +01:00
parent 446285fcad
commit 3de330643f
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lm_sensors-modprobe
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
if [ $# -ne 0 ]; then if [ $# -ne 0 ]; then
/sbin/modprobe -ab $@ /usr/sbin/modprobe -ab $@
else else
echo "No sensors with loadable kernel modules configured." echo "No sensors with loadable kernel modules configured."
echo "Please, run 'sensors-detect' as root in order to search for available sensors." echo "Please, run 'sensors-detect' as root in order to search for available sensors."

2
lm_sensors-modprobe-r
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
if [ $# -ne 0 ]; then if [ $# -ne 0 ]; then
/sbin/modprobe -abr $@ /usr/sbin/modprobe -abr $@
else else
echo "No sensors with loadable kernel modules configured." echo "No sensors with loadable kernel modules configured."
echo "Please, run 'sensors-detect' as root in order to search for available sensors." echo "Please, run 'sensors-detect' as root in order to search for available sensors."

14
lm_sensors.spec
View File

@ -1,6 +1,6 @@
Name: lm_sensors Name: lm_sensors
Version: 3.3.4 Version: 3.3.4
Release: 9%{?dist} Release: 10%{?dist}
Summary: Hardware monitoring tools Summary: Hardware monitoring tools
Group: Applications/System Group: Applications/System
License: LGPLv2+ and GPLv3+ and GPLv2+ and Verbatim and Public domain License: LGPLv2+ and GPLv3+ and GPLv2+ and Verbatim and Public domain
@ -21,6 +21,7 @@ Patch1: lm_sensors-3.3.4-lm_sensors-service-modprobe-warnings.patch
Patch2: lm_sensors-3.3.4-man-sensors-conf-conv.patch Patch2: lm_sensors-3.3.4-man-sensors-conf-conv.patch
Patch3: lm_sensors-3.3.4-sensors-detect-ppc-missing-vendor_id.patch Patch3: lm_sensors-3.3.4-sensors-detect-ppc-missing-vendor_id.patch
Requires: /usr/sbin/modprobe
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
Requires: /usr/sbin/dmidecode Requires: /usr/sbin/dmidecode
%endif %endif
@ -28,6 +29,7 @@ Requires(post): systemd-units
BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk
BuildRequires: rrdtool-devel BuildRequires: rrdtool-devel
%description %description
The lm_sensors package includes a collection of modules for general SMBus The lm_sensors package includes a collection of modules for general SMBus
access and hardware monitoring. access and hardware monitoring.
@ -72,6 +74,10 @@ database, and warns of sensor alarms.
mv prog/init/README prog/init/README.initscripts mv prog/init/README prog/init/README.initscripts
chmod -x prog/init/fancontrol.init chmod -x prog/init/fancontrol.init
# fixing the sensord-service-wrapper path
cp -p %{SOURCE5} sensord.service
sed -i "s|\@WRAPPER_DIR\@|%{_libexecdir}/%{name}|" sensord.service
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
@ -96,7 +102,7 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensord
mkdir -p $RPM_BUILD_ROOT%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -pm 644 prog/init/lm_sensors.service $RPM_BUILD_ROOT%{_unitdir} install -pm 644 prog/init/lm_sensors.service $RPM_BUILD_ROOT%{_unitdir}
install -pm 644 prog/init/fancontrol.service $RPM_BUILD_ROOT%{_unitdir} install -pm 644 prog/init/fancontrol.service $RPM_BUILD_ROOT%{_unitdir}
install -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir} install -pm 644 sensord.service $RPM_BUILD_ROOT%{_unitdir}
# customized modprobe calls # customized modprobe calls
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
@ -177,6 +183,10 @@ fi
%changelog %changelog
* Fri Jan 10 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.4-10
- Enhancing the sensord service wrapper (#863986)
- UsrMove and libexec path tunings
* Thu Jan 09 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.4-9 * Thu Jan 09 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.4-9
- Introducing sensord service wrapper (#949521) - Introducing sensord service wrapper (#949521)

2
sensord-service-wrapper
View File

@ -7,5 +7,7 @@ ARGS=""
[ "$LOG_INTERVAL" = "" ] || ARGS=`echo "$ARGS -l $LOG_INTERVAL"` [ "$LOG_INTERVAL" = "" ] || ARGS=`echo "$ARGS -l $LOG_INTERVAL"`
[ "$RRD_INTERVAL" = "" ] || ARGS=`echo "$ARGS -t $RRD_INTERVAL"` [ "$RRD_INTERVAL" = "" ] || ARGS=`echo "$ARGS -t $RRD_INTERVAL"`
[ "$RRD_LOGFILE" = "" ] || ARGS=`echo "$ARGS -r $RRD_LOGFILE"` [ "$RRD_LOGFILE" = "" ] || ARGS=`echo "$ARGS -r $RRD_LOGFILE"`
[ "$RRD_NO_AVG" = "1" ] && ARGS=`echo "$ARGS -T"`
[ "$LOAD_AVG" = "1" ] && ARGS=`echo "$ARGS -a"`
/usr/sbin/sensord -f daemon $ARGS /usr/sbin/sensord -f daemon $ARGS

2
sensord.service
View File

@ -7,7 +7,7 @@ After=syslog.target
EnvironmentFile=-/etc/sysconfig/sensord EnvironmentFile=-/etc/sysconfig/sensord
Type=forking Type=forking
PIDFile=/var/run/sensord.pid PIDFile=/var/run/sensord.pid
ExecStart=/usr/libexec/lm_sensors/sensord-service-wrapper ExecStart=@WRAPPER_DIR@/sensord-service-wrapper
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
sensord.sysconfig
View File

@ -14,3 +14,8 @@ LOG_INTERVAL=20m
# RRD db location # RRD db location
# RRD_LOGFILE=/var/log/sensors.rrd # RRD_LOGFILE=/var/log/sensors.rrd
# Switch RRD in non-average mode ... 1 - enabled, 0 - disabled (default)
# RRD_NO_AVG=1
# Include load average in RRD ... 1 - enabled, 0 - disabled (default)
# LOAD_AVG=1