env file path was fixed

This commit is contained in:
Petr Holasek 2012-08-29 16:29:39 +02:00
parent bb88e4e36f
commit 9e4622b2dd
3 changed files with 45 additions and 16 deletions

View File

@ -0,0 +1,12 @@
diff -up irqbalance-1.0.4/misc/irqbalance.service.orig irqbalance-1.0.4/misc/irqbalance.service
--- irqbalance-1.0.4/misc/irqbalance.service.orig 2012-08-29 16:24:42.011844627 +0200
+++ irqbalance-1.0.4/misc/irqbalance.service 2012-08-29 16:24:59.817845765 +0200
@@ -3,7 +3,7 @@ Description=irqbalance daemon
After=syslog.target
[Service]
-EnvironmentFile=/path/to/irqbalance.env
+EnvironmentFile=/etc/sysconfig/irqbalance
ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS
[Install]

View File

@ -1,6 +1,6 @@
Name: irqbalance Name: irqbalance
Version: 1.0.4 Version: 1.0.4
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 2 Epoch: 2
Summary: IRQ balancing daemon Summary: IRQ balancing daemon
@ -13,7 +13,8 @@ Source1: irqbalance.sysconfig
BuildRequires: autoconf automake libtool libcap-ng BuildRequires: autoconf automake libtool libcap-ng
BuildRequires: glib2-devel pkgconfig libcap-ng-devel BuildRequires: glib2-devel pkgconfig libcap-ng-devel
%ifnarch %{arm} %ifnarch %{arm}
BuildRequires: numactl-devel numactl-libs BuildRequires: numactl-devel
BuildRequires: systemd-units
Requires: numactl-libs Requires: numactl-libs
%endif %endif
Requires(post): systemd-units Requires(post): systemd-units
@ -23,12 +24,15 @@ Requires(preun):systemd-units
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
Patch1: irqbalance-1.0.4-env-file-path.patch
%description %description
irqbalance is a daemon that evenly distributes IRQ load across irqbalance is a daemon that evenly distributes IRQ load across
multiple CPUs for enhanced performance. multiple CPUs for enhanced performance.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%{configure} %{configure}
@ -36,7 +40,7 @@ CFLAGS="%{optflags}" make %{?_smp_mflags}
%install %install
install -D -p -m 0755 %{name} %{buildroot}%{_sbindir}/%{name} install -D -p -m 0755 %{name} %{buildroot}%{_sbindir}/%{name}
install -D -p -m 0644 ./misc/irqbalance.service %{buildroot}/lib/systemd/system/irqbalance.service install -D -p -m 0644 ./misc/irqbalance.service %{buildroot}%{_unitdir}/irqbalance.service
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name} install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
install -d %{buildroot}%{_mandir}/man1/ install -d %{buildroot}%{_mandir}/man1/
@ -46,7 +50,7 @@ install -p -m 0644 ./irqbalance.1 %{buildroot}%{_mandir}/man1/
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING AUTHORS %doc COPYING AUTHORS
%{_sbindir}/irqbalance %{_sbindir}/irqbalance
/lib/systemd/system/irqbalance.service %{_unitdir}/irqbalance.service
%{_mandir}/man1/* %{_mandir}/man1/*
%config(noreplace) %{_sysconfdir}/sysconfig/irqbalance %config(noreplace) %{_sysconfdir}/sysconfig/irqbalance
@ -66,6 +70,9 @@ fi
/sbin/chkconfig --del irqbalance >/dev/null 2>&1 || : /sbin/chkconfig --del irqbalance >/dev/null 2>&1 || :
%changelog %changelog
* Wed Aug 29 2012 Petr Holasek <pholasek@redhat.com> - 2:1.0.4-2
- Env file path edited
* Mon Aug 27 2012 Petr Holasek <pholasek@redhat.com> - 2:1.0.4-1 * Mon Aug 27 2012 Petr Holasek <pholasek@redhat.com> - 2:1.0.4-1
- Rebased to version 1.0.4 - Rebased to version 1.0.4

View File

@ -1,18 +1,28 @@
# irqbalance is a daemon process that distributes interrupts across # irqbalance is a daemon process that distributes interrupts across
# CPUS on SMP systems. The default is to rebalance once every 10 # CPUS on SMP systems. The default is to rebalance once every 10
# seconds. There is one configuration option: # seconds. This is the environment file that is specified to systemd via the
# EnvironmentFile key in the service unit file (or via whatever method the init
# system you're using has.
# #
# ONESHOT=yes # ONESHOT=yes
# after starting, wait for a minute, then look at the interrupt # after starting, wait for a minute, then look at the interrupt
# load and balance it once; after balancing exit and do not change # load and balance it once; after balancing exit and do not change
# it again. # it again.
ONESHOT= #IRQBALANCE_ONESHOT=
# #
# IRQ_AFFINITY_MASK # IRQBALANCE_BANNED_CPUS
# 64 bit bitmask which allows you to indicate which cpu's should # 64 bit bitmask which allows you to indicate which cpu's should
# be skipped when reblancing irqs. Cpu numbers which have their # be skipped when reblancing irqs. Cpu numbers which have their
# corresponding bits set to zero in this mask will not have any # corresponding bits set to one in this mask will not have any
# irq's assigned to them on rebalance # irq's assigned to them on rebalance
# #
#IRQ_AFFINITY_MASK= #IRQBALANCE_BANNED_CPUS=
#
# IRQBALANCE_ARGS
# append any args here to the irqbalance daemon as documented in the man page
#
#IRQBALANCE_ARGS=