[gentoo-commits] gentoo-x86 commit in net-wireless/hostapd/files: hostapd-init.d

[Bjarke Istrup Pedersen (gurligebis)]

gurligebis    14/03/21 19:47:14

  Modified:             hostapd-init.d
  Log:
  Improving init.d script and moved from /var/run to /run, fixing bug #505166
  
  (Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 15AE484C)

Revision  Changes    Path
1.4                  net-wireless/hostapd/files/hostapd-init.d

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d?r1=1.3&r2=1.4

Index: hostapd-init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hostapd-init.d	25 Sep 2011 14:03:46 -0000	1.3
+++ hostapd-init.d	21 Mar 2014 19:47:14 -0000	1.4
@@ -1,7 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.3 2011/09/25 14:03:46 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.4 2014/03/21 19:47:14 gurligebis Exp $
+
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/sbin/hostapd"
+command_args="-P ${pidfile} -B ${OPTIONS} ${CONFIGS}"
 
 extra_started_commands="reload"
 
@@ -15,7 +19,7 @@
 	use logger
 }
 
-checkconfig() {
+start_pre() {
 	local file
 
 	for file in ${CONFIGS}; do
@@ -26,25 +30,10 @@
 	done
 }
 
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/hostapd \
-		-- -B ${OPTIONS} ${CONFIGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/hostapd
-	eend $?
-}
-
 reload() {
-	checkconfig || return 1
+	start_pre || return 1
 
 	ebegin "Reloading ${SVCNAME} configuration"
-	kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
+	kill -HUP $(cat ${pidfile}) > /dev/null 2>&1
 	eend $?
 }