From nobody Sat Mar 19 14:00:47 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C2E971A158D2; Sat, 19 Mar 2022 14:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KLMwb59clz3GBF; Sat, 19 Mar 2022 14:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647698447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LfQl38pP1EbNuEi/LU/UfupfTDHNOieDOrtdWIdjdTI=; b=qZpDyIZVph3nndE4cvXbkaONGb+kpXtIb6eLY0P30SjvilvnN9BpemtvzvmnwFAfxTWkKF j2xEk5Qc6zKDdRRq83q5ZNjcSE2B0+HDFc1m9i4dz9ytd4JABYuaRBNyA/JMV6VFk1VYLy W0Nm+P09WWGCLHZGJ+l81wvcATVNUShlVdt+eQNAJh+nbMXkE1BDQfK5g3ZLj11R8pG401 DphdKS7MO4qAXaBhkkRj3j4wpKyrpZPAcJZb4LnZyjKsN6TEfS5Vfd9RJKqB8AlZnN7agZ Qrm/y01iQbEsjggqfNZz/M/M7YJjF7D+0ht9u2/+S30DObWPDoiWtE12wHjmdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92984146DA; Sat, 19 Mar 2022 14:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22JE0lQx090952; Sat, 19 Mar 2022 14:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JE0lfV090951; Sat, 19 Mar 2022 14:00:47 GMT (envelope-from git) Date: Sat, 19 Mar 2022 14:00:47 GMT Message-Id: <202203191400.22JE0lfV090951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: cb95daaa9189 - stable/13 - devd: remove the scsi regexp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb95daaa91895a74a2f6d2db0d0773517a34ab99 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647698447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LfQl38pP1EbNuEi/LU/UfupfTDHNOieDOrtdWIdjdTI=; b=C1FEbSRafFi3qYghgfwFzq77d/qc8kLaAOs5yDtfWXkPY8TZigQlswpeAL9byfFxdGnhUc ltaC0vGVj/BvaxpP9PxhiAjHg3rUQOl4vs6GfK5lkEjuW3upZv7vFmSM67n8TNArBbGacL 8euRn7LJop4r6XREQvEGKR41q0jP3ht6e6/waEPOFll+EQxqCTHagvEpp21u01a4CRpZFx PO/U+RmI12KLvbx8f7cNDOGNPsALDMHWubRf3dHO58UahB9bBW1z+taezgY1lyN1frCZsy nux/dyM8Dr+a67sCM/v9M/lw0bIPWOf6zw2NlswEp+boI0vtYb6IelhVLBmgKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647698447; a=rsa-sha256; cv=none; b=XlY5WGCjP9AZT33io3TAlxVc7k72DQ6EPJMMDqRoIZkv5kibkUVmQ0HpDS190CyvYEzymA jh3AHRO0nTxwb3qeoRZG63hEnk0J0iupODKIVGi2znrA3Zxj3SgkYibEtD63HeZS/e3Y9i lNGEzepAvn4KAqb6R2+bjjqXEhk1eT0Gist3FiwAszdw6PbkG1MbZ2tOalttGtHUHsSVHt RG7Lhuv8a3lAEuq1oeVTMck4SY4BCQO1K2V570iqsLu1Ty4KC62cn5iYpFBFdxsz5M4Y/M 2CFIH5b1drVe6ZZnxIeTzi5BrNLNErzzOiM/b/uOmpgNHqoqXNrFPFKqnzKbXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb95daaa91895a74a2f6d2db0d0773517a34ab99 commit cb95daaa91895a74a2f6d2db0d0773517a34ab99 Author: Warner Losh AuthorDate: 2022-01-09 17:13:58 +0000 Commit: Warner Losh CommitDate: 2022-03-19 13:59:07 +0000 devd: remove the scsi regexp We don't really use the scsi regexp for anything. The rescan was a workaround that was fixed a long time ago and has been disabled for ages. And the regexp was incomplete. Sponsored by: Netflix (cherry picked from commit 926e825ef823f49e371f61780634475a1f19c812) --- sbin/devd/devd.conf | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index d88f1fde743c..1836afe589e4 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -18,10 +18,6 @@ options { # Setup some shorthand for regex that we use later in the file. #XXX Yes, these are gross -- imp - set scsi-controller-regex - "(aac|aacraid|ahc|ahd|amr|ciss|\ - esp|ida|iir|ips|isp|mlx|mly|mpr|mps|mpt|sym|trm)\ - [0-9]+"; set wifi-driver-regex "(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|otus|ral|rsu|rtwn|rum|\ run|uath|upgt|ural|urtw|wi|wpi|wtap|zyd)[0-9]+"; @@ -155,15 +151,6 @@ notify 100 { action "service moused stop $cdev"; }; -# -# Rescan SCSI device-names on attach, but not detach. However, it is -# disabled by default due to reports of problems. -# -attach 0 { - device-name "$scsi-controller-regex"; -// action "camcontrol rescan all"; -}; - # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the # moment, as the pnpinfo variable isn't set in devd yet. Individual