From owner-svn-src-head@freebsd.org  Thu Aug 23 05:06:08 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CFCA10801EE;
 Thu, 23 Aug 2018 05:06:08 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id B7F437FA7D;
 Thu, 23 Aug 2018 05:06:07 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9949A1D729;
 Thu, 23 Aug 2018 05:06:07 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7N567YY062838;
 Thu, 23 Aug 2018 05:06:07 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N567Vt062837;
 Thu, 23 Aug 2018 05:06:07 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201808230506.w7N567Vt062837@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 23 Aug 2018 05:06:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338234 - head/sbin/init/rc.d
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sbin/init/rc.d
X-SVN-Commit-Revision: 338234
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2018 05:06:08 -0000

Author: imp
Date: Thu Aug 23 05:06:07 2018
New Revision: 338234
URL: https://svnweb.freebsd.org/changeset/base/338234

Log:
  Improve devmatch driver loading
  
  Use devctl freeze / thaw to allow us to laod multiple modules before
  doing the probe/attach so they all get a bite at the apple.
  
  Differential Revision: https://reviews.freebsd.org/D16735

Modified:
  head/sbin/init/rc.d/devmatch

Modified: head/sbin/init/rc.d/devmatch
==============================================================================
--- head/sbin/init/rc.d/devmatch	Thu Aug 23 05:05:47 2018	(r338233)
+++ head/sbin/init/rc.d/devmatch	Thu Aug 23 05:06:07 2018	(r338234)
@@ -44,9 +44,9 @@ devmatch_start()
 	local x
 
 	if [ -n "$one_nomatch" ]; then
-		x=$(devmatch -p "${one_nomatch}")
+		x=$(devmatch -p "${one_nomatch}" | sort -u)
 	else
-		x=$(devmatch)
+		x=$(devmatch | sort -u)
 	fi
 
 	[ -n "$x" ] || return
@@ -57,10 +57,12 @@ devmatch_start()
 	# We also optimize against the false positives
 	# or drivers that have symbolic links that
 	# confuse devmatch by running it -n.
+	devctl freeze
 	for m in ${x}; do
 		echo "Autoloading module: ${m}"
 		kldload -n ${m}
 	done
+	devctl thaw
 }
 
 load_rc_config $name