Module Name: src
Committed By: apb
Date: Wed Sep 30 18:17:22 UTC 2009
Modified Files:
src/etc/rc.d: wpa_supplicant
src/share/man/man5: rc.conf.5
Log Message:
Document the fact that wpa_supplicant won't start properly unless
/usr is mounted by mountcritlocal.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/wpa_supplicant
cvs rdiff -u -r1.136 -r1.137 src/share/man/man5/rc.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/wpa_supplicant
diff -u src/etc/rc.d/wpa_supplicant:1.2 src/etc/rc.d/wpa_supplicant:1.3
--- src/etc/rc.d/wpa_supplicant:1.2 Mon Nov 17 11:34:04 2008
+++ src/etc/rc.d/wpa_supplicant Wed Sep 30 18:17:22 2009
@@ -1,11 +1,19 @@
#!/bin/sh
#
-# $NetBSD: wpa_supplicant,v 1.2 2008/11/17 11:34:04 abs Exp $
+# $NetBSD: wpa_supplicant,v 1.3 2009/09/30 18:17:22 apb Exp $
#
# PROVIDE: wpa_supplicant
# REQUIRE: network mountcritlocal
# BEFORE: NETWORKING dhclient
+#
+# We need to run a command that resides in /usr/sbin, and the
+# /usr file system is traditionally mounted by mountcritremote.
+# However, we cannot depend on mountcritremote, because that
+# would introduce a circular dependency. Therefore, if you need
+# wpa_supplicant to start during the boot process, you should
+# ensure that the /usr file system is mounted by mountcritlocal,
+# not by mountcritremote.
$_rc_subr_loaded . /etc/rc.subr
Index: src/share/man/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.136 src/share/man/man5/rc.conf.5:1.137
--- src/share/man/man5/rc.conf.5:1.136 Mon Sep 14 12:37:08 2009
+++ src/share/man/man5/rc.conf.5 Wed Sep 30 18:17:22 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: rc.conf.5,v 1.136 2009/09/14 12:37:08 wiz Exp $
+.\" $NetBSD: rc.conf.5,v 1.137 2009/09/30 18:17:22 apb Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -55,7 +55,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd September 14, 2009
+.Dd September 30, 2009
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -829,6 +829,15 @@
Run
.Xr wpa_supplicant 8 ,
WPA/802.11i Supplicant for wireless network devices.
+If you set
+.Sy wpa_suplicant
+true, then
+.Pa /usr
+must be in
+.Sy critical_filesystems_local ,
+or
+.Pa /usr
+must be on the root file system.
.El
.Ss Daemons required by other daemons
.Bl -tag -width net_interfaces
