head	1.6;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.3.4.2.2.2
	RELENG_9_1:1.3.4.2.0.2
	RELENG_9_1_BP:1.3.4.2
	RELENG_8_3_0_RELEASE:1.3.2.2.2.1
	RELENG_8_3:1.3.2.2.0.2
	RELENG_8_3_BP:1.3.2.2
	RELENG_9_0_0_RELEASE:1.3.4.1.2.1
	RELENG_9_0:1.3.4.1.0.2
	RELENG_9_0_BP:1.3.4.1
	RELENG_9:1.3.0.4
	RELENG_9_BP:1.3
	RELENG_7_4_0_RELEASE:1.1.4.1.8.1
	RELENG_8_2_0_RELEASE:1.3.2.1.6.1
	RELENG_7_4:1.1.4.1.0.8
	RELENG_7_4_BP:1.1.4.1
	RELENG_8_2:1.3.2.1.0.6
	RELENG_8_2_BP:1.3.2.1
	RELENG_8_1_0_RELEASE:1.3.2.1.4.1
	RELENG_8_1:1.3.2.1.0.4
	RELENG_8_1_BP:1.3.2.1
	RELENG_7_3_0_RELEASE:1.1.4.1.6.1
	RELENG_7_3:1.1.4.1.0.6
	RELENG_7_3_BP:1.1.4.1
	RELENG_8_0_0_RELEASE:1.3.2.1.2.1
	RELENG_8_0:1.3.2.1.0.2
	RELENG_8_0_BP:1.3.2.1
	RELENG_8:1.3.0.2
	RELENG_8_BP:1.3
	RELENG_7_2_0_RELEASE:1.1.4.1.4.1
	RELENG_7_2:1.1.4.1.0.4
	RELENG_7_2_BP:1.1.4.1
	RELENG_7_1_0_RELEASE:1.1.4.1.2.1
	RELENG_6_4_0_RELEASE:1.1.2.1.8.1
	RELENG_7_1:1.1.4.1.0.2
	RELENG_7_1_BP:1.1.4.1
	RELENG_6_4:1.1.2.1.0.8
	RELENG_6_4_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.1.6.1
	RELENG_6_3_0_RELEASE:1.1.2.1
	RELENG_7_0:1.1.0.6
	RELENG_7_0_BP:1.1
	RELENG_6_3:1.1.2.1.0.6
	RELENG_6_3_BP:1.1.2.1
	RELENG_7:1.1.0.4
	RELENG_7_BP:1.1
	RELENG_6_2_0_RELEASE:1.1.2.1
	RELENG_6_2:1.1.2.1.0.4
	RELENG_6_2_BP:1.1.2.1
	RELENG_6_1_0_RELEASE:1.1.2.1
	RELENG_6_1:1.1.2.1.0.2
	RELENG_6_1_BP:1.1.2.1
	RELENG_6:1.1.0.2;
locks; strict;
comment	@# @;


1.6
date	2013.06.27.00.29.23;	author svnexp;	state Exp;
branches;
next	1.5;

1.5
date	2012.11.17.01.49.04;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2012.01.14.02.18.41;	author dougb;	state Exp;
branches;
next	1.3;

1.3
date	2008.04.20.20.37.20;	author sam;	state Exp;
branches
	1.3.2.1
	1.3.4.1;
next	1.2;

1.2
date	2007.11.14.21.19.15;	author brix;	state Exp;
branches;
next	1.1;

1.1
date	2006.02.03.01.35.36;	author flz;	state Exp;
branches
	1.1.2.1
	1.1.4.1
	1.1.6.1;
next	;

1.5.2.1
date	2012.11.17.01.49.04;	author svnexp;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2013.03.28.13.02.43;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.3.2.1.2.1
	1.3.2.1.4.1
	1.3.2.1.6.1;
next	1.3.2.2;

1.3.2.2
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.3.2.2.2.1;
next	1.3.2.3;

1.3.2.3
date	2012.11.17.10.35.56;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.3.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.3.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.3.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.3.2.2.2.2;

1.3.2.2.2.2
date	2012.11.17.08.24.38;	author svnexp;	state Exp;
branches;
next	;

1.3.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.3.4.1.2.1;
next	1.3.4.2;

1.3.4.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches
	1.3.4.2.2.1;
next	1.3.4.3;

1.3.4.3
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	1.3.4.4;

1.3.4.4
date	2013.07.05.03.01.57;	author svnexp;	state Exp;
branches;
next	;

1.3.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.3.4.1.2.2;

1.3.4.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.3.4.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.3.4.2.2.2;

1.3.4.2.2.2
date	2012.11.17.08.47.01;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2006.02.12.22.13.15;	author flz;	state Exp;
branches
	1.1.2.1.8.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.39.07;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1
date	2008.01.07.21.15.40;	author brix;	state Exp;
branches
	1.1.4.1.2.1
	1.1.4.1.4.1
	1.1.4.1.6.1
	1.1.4.1.8.1;
next	1.1.4.2;

1.1.4.2
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.1.4.3;

1.1.4.3
date	2012.11.17.08.01.20;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1.6.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.4.1.8.2;

1.1.4.1.8.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.1.6.1
date	2008.01.07.21.15.45;	author brix;	state Exp;
branches;
next	;


desc
@@


1.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252230
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/hostapd 252230 2013-06-26 04:00:52Z rpaulo $
#

# PROVIDE: hostapd
# REQUIRE: mountcritremote
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="hostapd"
command="/usr/sbin/${name}"

ifn="$2"
if [ -z "$ifn" ]; then
	rcvar="hostapd_enable"
	conf_file="/etc/${name}.conf"
	pidfile="/var/run/${name}.pid"
else
	rcvar=
	conf_file="/etc/${name}-${ifn}.conf"
	pidfile="/var/run/${name}-${ifn}.pid"
fi

command_args="-P ${pidfile} -B ${conf_file}"
required_files="${conf_file}"
required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
extra_commands="reload"

load_rc_config ${name}
run_rc_command "$1"
@


1.5
log
@Switching exporter and resync
@
text
@d3 1
a3 1
# $FreeBSD: head/etc/rc.d/hostapd 230099 2012-01-14 02:18:41Z dougb $
a12 1
rcvar="hostapd_enable"
d15 10
a24 2
conf_file="/etc/${name}.conf"
pidfile="/var/run/${name}.pid"
@


1.5.2.1
log
@file hostapd was added on branch RELENG_8_4 on 2013-03-28 13:02:43 +0000
@
text
@d1 25
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 25
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/hostapd 231655 2012-02-14 10:17:14Z dougb $
#

# PROVIDE: hostapd
# REQUIRE: mountcritremote
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="hostapd"
rcvar="hostapd_enable"
command="/usr/sbin/${name}"

conf_file="/etc/${name}.conf"
pidfile="/var/run/${name}.pid"

command_args="-P ${pidfile} -B ${conf_file}"
required_files="${conf_file}"
required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
extra_commands="reload"

load_rc_config ${name}
run_rc_command "$1"
@


1.4
log
@SVN rev 230099 on 2012-01-14 02:18:41Z by dougb

Prepare for the removal of set_rcvar() by changing the rcvar=
assignments to the literal values it would have returned.

The concept of set_rcvar() was nice in theory, but the forks
it creates are a drag on the startup process, which is especially
noticeable on slower systems, such as embedded ones.

During the discussion on freebsd-rc@@ a preference was expressed for
using ${name}_enable instead of the literal values. However the
code portability concept doesn't really apply since there are so
many other places where the literal name has to be searched for
and replaced. Also, using the literal value is also a tiny bit
faster than dereferencing the variables, and every little bit helps.
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.3
log
@rc support for vaps
@
text
@d13 1
a14 1
rcvar=`set_rcvar`
@


1.3.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.4.2
log
@SVN rev 231653 on 2012-02-14 10:16:56Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@a12 1
rcvar="hostapd_enable"
d14 1
@


1.3.4.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/hostapd 231653 2012-02-14 10:16:56Z dougb $
@


1.3.4.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252748
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/hostapd 252748 2013-07-05 02:06:59Z rpaulo $
d13 1
d16 2
a17 10
ifn="$2"
if [ -z "$ifn" ]; then
	rcvar="hostapd_enable"
	conf_file="/etc/${name}.conf"
	pidfile="/var/run/${name}.pid"
else
	rcvar=
	conf_file="/etc/${name}-${ifn}.conf"
	pidfile="/var/run/${name}-${ifn}.pid"
fi
@


1.3.4.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.3.4.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/hostapd 231653 2012-02-14 10:16:56Z dougb $
@


1.3.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3.4.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/hostapd 180563 2008-07-16 19:22:48Z dougb $
@


1.3.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.3.2.2
log
@SVN rev 231655 on 2012-02-14 10:17:14Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@a12 1
rcvar="hostapd_enable"
d14 1
@


1.3.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/8/etc/rc.d/hostapd 231655 2012-02-14 10:17:14Z dougb $
@


1.3.2.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/hostapd 231655 2012-02-14 10:17:14Z dougb $
@


1.3.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2
log
@Add reload functionality.

PR:		conf/116659
Approved by:	sam, erwin (mentor)
@
text
@d21 1
@


1.1
log
@- Add a startup script for hostapd.
- Document associated variable in rc.conf(5).

Approved by:	dougb
MFC after:	1 week
@
text
@d17 1
d19 1
a19 1
command_args="-B ${conf_file}"
d21 1
@


1.1.6.1
log
@MFC: (revision 1.2)

Add reload functionality.

Approved by:	re (kensmith), erwin (mentor)
@
text
@a16 1
pidfile="/var/run/${name}.pid"
d18 1
a18 1
command_args="-P ${pidfile} -B ${conf_file}"
a19 1
extra_commands="reload"
@


1.1.4.1
log
@MFC: (revision 1.2)

Add reload functionality.

Approved by:	re (kensmith), erwin (mentor)
@
text
@a16 1
pidfile="/var/run/${name}.pid"
d18 1
a18 1
command_args="-P ${pidfile} -B ${conf_file}"
a19 1
extra_commands="reload"
@


1.1.4.2
log
@SVN rev 231656 on 2012-02-14 10:17:30Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@a12 1
rcvar="hostapd_enable"
d14 1
@


1.1.4.3
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/hostapd 231656 2012-02-14 10:17:30Z dougb $
@


1.1.4.1.8.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.1.4.1.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/hostapd 175142 2008-01-07 21:15:45Z brix $
@


1.1.4.1.6.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.1.4.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1.4.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.1
log
@MFC:

  - Add a startup script for hostapd.
  - Document associated variable in rc.conf(5).

      src/etc/rc.d/Makefile: rev 1.64 -> 1.65
      src/share/man/man5/rc.conf.5: rev 1.283 -> 1.284
      src/etc/rc.d/hostapd: rev 0 -> 1.1
      src/etc/defaults/rc.conf: rev 1.273 -> 1.274

Approved by:	re (hrs)
@
text
@@


1.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/hostapd 155589 2006-02-12 22:13:16Z flz $
@


1.1.2.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


