From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 27 May 2012 12:16:16 +0000 (+0000)
Subject: hostapd: Make systemd unit file independent from network.service.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccdd7d5a0b21f373e657dc4bbbb64cf5ffec3cfa;p=ipfire-3.x.git

hostapd: Make systemd unit file independent from network.service.

Within the startup of network.service, hostapd needs to be
started which will cause a deadlock.
This patch removes the requirement of hostapd, that the network
service has already to be up.
---

diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm
index 507c0ea64..a5de902d8 100644
--- a/hostapd/hostapd.nm
+++ b/hostapd/hostapd.nm
@@ -5,7 +5,7 @@
 
 name       = hostapd
 version    = 0.7.3
-release    = 1
+release    = 2
 
 groups     = Networking/Tools
 url        = http://hostap.epitest.fi/hostapd/
@@ -46,7 +46,6 @@ end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-debuginfo
 		template DEBUGINFO
diff --git a/hostapd/systemd/hostapd@.service b/hostapd/systemd/hostapd@.service
index 2cff6d9c7..748cb0ea5 100644
--- a/hostapd/systemd/hostapd@.service
+++ b/hostapd/systemd/hostapd@.service
@@ -8,8 +8,7 @@
 [Unit]
 Description=WLAN AP on %I
 BindTo=dev-%I.device
-After=dev-%I.device network.service
-Requires=network.service
+After=dev-%I.device
 
 [Service]
 ExecStart=/usr/bin/hostapd -dd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config