From owner-svn-src-head@freebsd.org Thu Aug 23 05:06:32 2018 Return-Path: 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 E41EA1080216; Thu, 23 Aug 2018 05:06:31 +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 9889A7FD55; Thu, 23 Aug 2018 05:06:28 +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 D79F41D72E; Thu, 23 Aug 2018 05:06:27 +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 w7N56RHg063054; Thu, 23 Aug 2018 05:06:27 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N56RTX063052; Thu, 23 Aug 2018 05:06:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201808230506.w7N56RTX063052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 23 Aug 2018 05:06:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338238 - in head/sbin/init: . rc.d X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sbin/init: . rc.d X-SVN-Commit-Revision: 338238 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2018 05:06:32 -0000 Author: imp Date: Thu Aug 23 05:06:27 2018 New Revision: 338238 URL: https://svnweb.freebsd.org/changeset/base/338238 Log: Implement blacklisting for devmatch devmatch_blacklist is a space separated list of modules (w/o the .ko or full path) to exclude from devmatch's processing. Differential Revision: https://reviews.freebsd.org/D16735 Modified: head/sbin/init/rc.conf head/sbin/init/rc.d/devmatch Modified: head/sbin/init/rc.conf ============================================================================== --- head/sbin/init/rc.conf Thu Aug 23 05:06:22 2018 (r338237) +++ head/sbin/init/rc.conf Thu Aug 23 05:06:27 2018 (r338238) @@ -42,6 +42,7 @@ ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). devmatch_enable="YES" # Demand load kernel modules based on device ids. +devmatch_blacklist="" # List of modules (w/o .ko) to exclude from devmatch. #kld_list="" # Kernel modules to load after local disks are mounted kldxref_enable="YES" # Build linker.hints files with kldxref(8). kldxref_clobber="NO" # Overwrite old linker.hints at boot. Modified: head/sbin/init/rc.d/devmatch ============================================================================== --- head/sbin/init/rc.d/devmatch Thu Aug 23 05:06:22 2018 (r338237) +++ head/sbin/init/rc.d/devmatch Thu Aug 23 05:06:27 2018 (r338238) @@ -41,15 +41,15 @@ one_nomatch="$2" devmatch_start() { - local x + local x m list if [ -n "$one_nomatch" ]; then - x=$(devmatch -p "${one_nomatch}" | sort -u) + list=$(devmatch -p "${one_nomatch}" | sort -u) else - x=$(devmatch | sort -u) + list=$(devmatch | sort -u) fi - [ -n "$x" ] || return + [ -n "$list" ] || return # While kldload can accept multiple modules # on the line at once, we loop here in case @@ -57,8 +57,14 @@ devmatch_start() # We also optimize against the false positives # or drivers that have symbolic links that # confuse devmatch by running it -n. + # Finally, we filter out all items in the + # devmactch_blacklist. devctl freeze - for m in ${x}; do + x=$(echo ${devmatch_blacklist} | tr ' ' '#') + for m in ${list}; do + case "#${x}#" in + *"#${m}#"*) continue ;; + esac echo "Autoloading module: ${m}" kldload -n ${m} done