hostapd: Make new-style systemd unit file.

diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm
index 359add55a0eb82c4001430a0fdb5b078219653c2..5e7351babf2adf2d7ded8a63e4528ed846395393 100644 (file)
--- 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 0fbfab50b1b18757464e8eb865788af1234e9e42..b0c0a124d4afcc85e12474800b17514a80634bd2 100644 (file)
--- 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