From owner-svn-src-head@freebsd.org Sat Feb 17 13:32:29 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 C8A0CF0DFB1; Sat, 17 Feb 2018 13:32:29 +0000 (UTC) (envelope-from hselasky@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 7E76C7E2A9; Sat, 17 Feb 2018 13:32:29 +0000 (UTC) (envelope-from hselasky@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 796B81D625; Sat, 17 Feb 2018 13:32:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1HDWTnt032550; Sat, 17 Feb 2018 13:32:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1HDWTBr032549; Sat, 17 Feb 2018 13:32:29 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802171332.w1HDWTBr032549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 17 Feb 2018 13:32:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329456 - head/etc/rc.d X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/etc/rc.d X-SVN-Commit-Revision: 329456 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.25 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: Sat, 17 Feb 2018 13:32:29 -0000 Author: hselasky Date: Sat Feb 17 13:32:29 2018 New Revision: 329456 URL: https://svnweb.freebsd.org/changeset/base/329456 Log: Fix handling of "one_nomatch" shell variable to preserve its contents appearing as a single argument passed to devmatch(8). Don't depend on "sort" utility from usr/bin which might not be available when devd is started. Sponsored by: Mellanox Technologies Modified: head/etc/rc.d/devmatch Modified: head/etc/rc.d/devmatch ============================================================================== --- head/etc/rc.d/devmatch Sat Feb 17 13:13:55 2018 (r329455) +++ head/etc/rc.d/devmatch Sat Feb 17 13:32:29 2018 (r329456) @@ -37,13 +37,17 @@ desc="Use devmatch(8) to load kernel modules" start_cmd="${name}_start" stop_cmd=':' -[ -n "$2" ] && one_nomatch="-p '$2'" +one_nomatch="$2" devmatch_start() { local x - x=$(devmatch ${one_nomatch} | sort -u) + if [ -n "$one_nomatch" ]; then + x=$(devmatch -p "${one_nomatch}") + else + x=$(devmatch) + fi [ -n "$x" ] || return @@ -53,8 +57,8 @@ devmatch_start() # We also optimize against the false positives # or drivers that have symbolic links that # confuse devmatch by running it -n. - echo "Autoloading modules: ${x}" for m in ${x}; do + echo "Autoloading module: ${m}" kldload -n ${m} done }