From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Oct 2012 07:21:41 +0000 (+0000)
Subject: hostapd: Make new-style systemd unit file.
X-Git-Tag: pango~450^2~9
X-Git-Url: http://git.ipfire.org/?p=people%2Fstevee%2Fipfire-3.x.git;a=commitdiff_plain;h=44ee7247a3f98e46b2c9517c468df40130f5ed9f

hostapd: Make new-style systemd unit file.
---

diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm
index 359add55a..5e7351bab 100644
--- a/hostapd/hostapd.nm
+++ b/hostapd/hostapd.nm
@@ -5,7 +5,7 @@
 
 name       = hostapd
 version    = 1.0
-release    = 1
+release    = 2
 
 groups     = Networking/Tools
 url        = http://hostap.epitest.fi/hostapd/
diff --git a/hostapd/systemd/hostapd@.service b/hostapd/systemd/hostapd@.service
index 0fbfab50b..b0c0a124d 100644
--- a/hostapd/systemd/hostapd@.service
+++ b/hostapd/systemd/hostapd@.service
@@ -2,6 +2,9 @@
 Description=hostap daemon on %I
 
 [Service]
-ExecStart=/usr/sbin/hostapd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config
+ExecStartPre=/usr/lib/network/helpers/hostapd-config-helper create %I
+ExecStart=/usr/sbin/hostapd -P /run/hostapd/%I.pid /run/network/ports/%I/hostapd.conf
+ExecStopPost=/usr/lib/network/helpers/hostapd-config-helper remove %I
+Restart=on-failure
 UtmpIdentifier=%I
 KillMode=process