From d692d381a91f6bab18b208d20a2a725f3426ea1b Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 10 Dec 2020 10:13:45 -0500
Subject: [PATCH] Enable environment file in hostapd service definition

---
 hostapd.service | 3 ++-
 hostapd.spec    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hostapd.service b/hostapd.service
index 5df5d6f..d7c2ca0 100644
--- a/hostapd.service
+++ b/hostapd.service
@@ -5,7 +5,8 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/hostapd.pid
-ExecStart=/usr/sbin/hostapd /etc/hostapd/hostapd.conf -P /run/hostapd.pid -B
+EnvironmentFile=/etc/sysconfig/hostapd
+ExecStart=/usr/sbin/hostapd /etc/hostapd/hostapd.conf -P /run/hostapd.pid -B $OTHER_ARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/hostapd.spec b/hostapd.spec
index c6748eb..be84ec3 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -2,7 +2,7 @@
 
 Name:           hostapd
 Version:        2.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 License:        BSD
 URL:            http://w1.fi/hostapd
@@ -191,6 +191,9 @@ fi
 %{_sysconfdir}/logwatch/scripts/services/%{name}
 
 %changelog
+* Thu Dec 10 2020 Johwn W. Linville <linville@redhat.com> - 2.9-6
+- Enable environment file in hostapd service definition
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild