From 730501427e46650f66809909d2ee8136b6a65604 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 4 Jun 2020 18:02:01 -0700
Subject: [PATCH] Restore environment file patch and fix service start
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks Ondřej Lysoněk for the patch rediff.
---
 irqbalance-1.0.4-env-file-path.patch | 12 ------------
 irqbalance-1.6.0-env-file-path.patch | 11 +++++++++++
 irqbalance.spec                      |  7 ++++++-
 3 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 irqbalance-1.0.4-env-file-path.patch
 create mode 100644 irqbalance-1.6.0-env-file-path.patch

diff --git a/irqbalance-1.0.4-env-file-path.patch b/irqbalance-1.0.4-env-file-path.patch
deleted file mode 100644
index 450d755..0000000
--- a/irqbalance-1.0.4-env-file-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./misc/irqbalance.service.path ./misc/irqbalance.service
---- ./misc/irqbalance.service.path	2017-11-14 13:09:56.011146473 -0500
-+++ ./misc/irqbalance.service	2017-11-14 13:10:13.480075654 -0500
-@@ -4,7 +4,7 @@ After=syslog.target
- ConditionVirtualization=!container
- 
- [Service]
--EnvironmentFile=/path/to/irqbalance.env
-+EnvironmentFile=/etc/sysconfig/irqbalance
- ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS
- 
- [Install]
diff --git a/irqbalance-1.6.0-env-file-path.patch b/irqbalance-1.6.0-env-file-path.patch
new file mode 100644
index 0000000..9423071
--- /dev/null
+++ b/irqbalance-1.6.0-env-file-path.patch
@@ -0,0 +1,11 @@
+--- a/misc/irqbalance.service	2020-06-02 14:33:35.794592546 +0200
++++ b/misc/irqbalance.service	2020-06-02 14:34:08.678922108 +0200
+@@ -5,7 +5,7 @@
+ ConditionVirtualization=!container
+ 
+ [Service]
+-EnvironmentFile=/path/to/irqbalance.env
++EnvironmentFile=/etc/sysconfig/irqbalance
+ ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS
+ CapabilityBoundingSet=
+ NoNewPrivileges=yes
diff --git a/irqbalance.spec b/irqbalance.spec
index d396fca..0b3949a 100644
--- a/irqbalance.spec
+++ b/irqbalance.spec
@@ -1,6 +1,6 @@
 Name:           irqbalance
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 Summary:        IRQ balancing daemon
 
@@ -22,6 +22,7 @@ Requires: numactl-libs
 
 ExcludeArch: s390 s390x
 
+Patch1: irqbalance-1.6.0-env-file-path.patch
 
 %description
 irqbalance is a daemon that evenly distributes IRQ load across
@@ -29,6 +30,7 @@ multiple CPUs for enhanced performance.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 ./autogen.sh
@@ -69,6 +71,9 @@ fi
 /sbin/chkconfig --del irqbalance >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 04 2020 Adam Williamson <awilliam@redhat.com> - 2:1.6.0-2
+- Restore environment file patch and fix service start (thanks Ondřej Lysoněk)
+
 * Wed Jun 03 2020 Neil Horman <nhorman@redhat.com> - 2:1.6.0-1
 - Update to latest upstream (bz1712908)