Merge sync of head

3 files changed, 52 insertions, 3 deletions

diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 518e5e2..fc00216 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -10,8 +10,7 @@ WARNS?=	3
 
 NO_SHARED?=YES
 
-DPADD=	${LIBL} ${LIBUTIL}
-LDADD=	-ll -lutil
+LIBADD=	l util
 
 YFLAGS+=-v
 CFLAGS+=-I. -I${.CURDIR}
diff --git a/sbin/devd/Makefile.depend b/sbin/devd/Makefile.depend
index adc7292..9102b49 100644
--- a/sbin/devd/Makefile.depend
+++ b/sbin/devd/Makefile.depend
@@ -13,6 +13,7 @@ DIRDEPS = \
 	lib/libutil \
 	lib/msun \
 	usr.bin/lex/lib \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index 311228e..3956a73 100644
--- a/sbin/devd/devd.conf.5
+++ b/sbin/devd/devd.conf.5
@@ -41,7 +41,7 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\"
-.Dd February 22, 2013
+.Dd May 13, 2015
 .Dt DEVD.CONF 5
 .Os
 .Sh NAME
@@ -270,6 +270,8 @@ Interface Class (USB)
 Interface Protocol  (USB)
 .It Li intsubclass
 Interface Sub-class (USB)
+.It Li jail
+Jail name for the process triggering the rule (RCTL)
 .It Li manufacturer
 Manufacturer ID (pccard).
 .It Li mode
@@ -280,12 +282,18 @@ Match the value of the
 variable.
 .It Li parent
 Parent device
+.It Li pid
+PID of the process triggering the rule (RCTL)
 .It Li port
 Hub port number (USB)
 .It Li product
 Product ID (pccard/USB).
 .It Li release
 Hardware revision (USB)
+.It Li ruid
+Real UID of the process triggering the rule (RCTL)
+.It Li rule
+Rule (RCTL)
 .It Li sernum
 Serial Number (USB).
 .It Li slot
@@ -370,6 +378,47 @@ node is destroyed.
 .El
 .El
 .Pp
+.It Li GEOM
+Events related to the
+.Xr geom 4
+framework.
+The difference compared to
+.Li DEVFS
+is that
+.Li GEOM
+only includes disk-like devices.
+.Bl -tag -width ".Sy Subsystem" -compact
+.It Sy Subsystem
+.It Li DEV
+.Bl -tag -width ".Li MEDIACHANGE" -compact
+.It Sy Type
+.It Li CREATE
+A
+.Xr geom 4
+device node is created.
+.It Li DESTROY
+A
+.Xr geom 4
+device node is destroyed.
+.It Li MEDIACHANGE
+Physical media has changed.
+.El
+.El
+.Pp
+.It Li RCTL
+Events related to the
+.Xr rctl 8
+framework.
+.Bl -tag -width ".Sy Subsystem" -compact
+.It Sy Subsystem
+.It Li rule
+.Bl -tag -width ".Li matched" -compact
+.It Sy Type
+.It Li matched
+A rule with action specified as "devctl" was triggered.
+.El
+.El
+.Pp
 .It Li USB
 Events related to the USB subsystem.
 .Bl -tag -width ".Sy Subsystem" -compact