From owner-svn-src-stable@FreeBSD.ORG  Thu May 21 13:13:57 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 891B0D48;
 Thu, 21 May 2015 13:13:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76AC41B76;
 Thu, 21 May 2015 13:13:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4LDDvge092831;
 Thu, 21 May 2015 13:13:57 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4LDDvNK092830;
 Thu, 21 May 2015 13:13:57 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201505211313.t4LDDvNK092830@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 21 May 2015 13:13:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r283226 - stable/10/etc
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 May 2015 13:13:57 -0000

Author: trasz
Date: Thu May 21 13:13:56 2015
New Revision: 283226
URL: https://svnweb.freebsd.org/changeset/base/283226

Log:
  MFC r277171:
  
  Use newly added GEOM notifications to discard autofs caches.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/etc/devd.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/devd.conf
==============================================================================
--- stable/10/etc/devd.conf	Thu May 21 13:11:48 2015	(r283225)
+++ stable/10/etc/devd.conf	Thu May 21 13:13:56 2015	(r283226)
@@ -318,16 +318,11 @@ notify 0 {
 	action			"/usr/local/etc/rc.d/postgresql restart";
 };
 
-# Discard autofs caches, useful for the -media special map.  The one
-# second delay is for GEOM to finish tasting.
-#
-# XXX: We should probably have a devctl(4) event that fires after GEOM
-#      tasting.
-#
+# Discard autofs caches, useful for the -media special map.
 notify 100 {
-	match "system" "DEVFS";
-	match "cdev" "(da|mmcsd)[0-9]+";
-	action "sleep 1 && /usr/sbin/automount -c";
+	match "system" "GEOM";
+	match "subsystem" "DEV";
+	action "/usr/sbin/automount -c";
 };
 
 */