aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gerzo <danger@FreeBSD.org>2008-07-01 21:52:49 +0000
committerDaniel Gerzo <danger@FreeBSD.org>2008-07-01 21:52:49 +0000
commit283146a2390ae04c115dfbf423453ba0f638e3cb (patch)
treee3d0028e74920ff7c1aaca799bda11be208f1dfb
parent9ea29562d9a54a66edd33b4a81539a9d51aebee1 (diff)
downloadsrc-283146a2390ae04c115dfbf423453ba0f638e3cb.tar.gz
src-283146a2390ae04c115dfbf423453ba0f638e3cb.zip
- install the example wpa_supplicant.conf file to the share/examples/etc
directory [1] - add the FILES section to the wpa_supplicant.conf.5 file, so that people will be able to detect the example configuration file easier. [2] PR: docs/121821 [2] Approved by: brooks [1] MFC after: 3 days
Notes
Notes: svn path=/head/; revision=180158
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile2
-rw-r--r--usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.55
2 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 9465a46c0838..927510f8e2ad 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -16,7 +16,7 @@ SRCS= config.c eloop.c common.c md5.c rc4.c sha1.c aes_wrap.c \
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
.if ${MK_EXAMPLES} != "no"
-FILESDIR= ${SHAREDIR}/examples/wpa_supplicant
+FILESDIR= ${SHAREDIR}/examples/etc
FILES= wpa_supplicant.conf
.endif
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index 084176ccf646..69f0bd6dbb98 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
@@ -518,6 +518,11 @@ network={
wep_key0=42FEEDDEAFBABEDEAFBEEFAA55
}
.Ed
+.Sh FILES
+.Bl -tag -width ".Pa /usr/share/examples/etc/wpa_supplicant.conf" -compact
+.It Pa /etc/wpa_supplicant.conf
+.It Pa /usr/share/examples/etc/wpa_supplicant.conf
+.El
.Sh SEE ALSO
.Xr wpa_cli 8 ,
.Xr wpa_passphrase 8 ,