From nobody Sun Jan 09 17:18:06 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 134D0193956B; Sun, 9 Jan 2022 17:18:07 +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 4JX3Z64ZQfz4n1k; Sun, 9 Jan 2022 17:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7D07316293; Sun, 9 Jan 2022 17:18:06 +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 209HI64j071122; Sun, 9 Jan 2022 17:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 209HI6ZJ071121; Sun, 9 Jan 2022 17:18:06 GMT (envelope-from git) Date: Sun, 9 Jan 2022 17:18:06 GMT Message-Id: <202201091718.209HI6ZJ071121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 926e825ef823 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 926e825ef823f49e371f61780634475a1f19c812 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641748686; 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=FFFluh2JaE5oy9vDI8QzoGZCq4g2VO+C2bEu5fbTons=; b=Gd1eFh4FaqN6fJK45JbHxr+0pHyVUXyg7f3VnPEVqBwNJm7ylzfYJ/JxIIa9sh3bW+qy5Z N+F1w8baHssVGyxHhTTVzmztXgx1QM6xrT8lCJLxcVtywhciSWsx0qiB+AekpcVRfuhGhx ySRQhD+2TF/nztUZSfxWxRcyUl6c0pAEeLp+XpBJ61/hWsVbDRU0LiIkF8syJIdmP0ZamB SCtk68vH/g87MZTrBD01GMWxv5+/+dIWjoHLy52H9rgpd+bPHOvOt+l6/ZebB5PThcBwjB 1pBD44GyIW5lc83HMztZyChGJCnGEI9HU42yJ4Wa/xKEj6OFpWXnRbsGDh4PyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641748686; a=rsa-sha256; cv=none; b=wN6Wodf6antYpu5nu4oPhkQoha5ogqQV24s502KYgmEat1Vi5L0F+wfkGIEUb1sUQOZeTV mWrxqr6aVdsG5dsl2YieCFPkF8z+1kb695JQpbWO+dOzibUX7O+lfPaWrMLETyKbxrGMkQ I7tnDhjJhT4ZCqTSBAgY/jZX/DE2rZNBx8UooqcfJqZrC5NavtpEFjiXOG01TQSIwz8/QF 4wbj45Xh2OVTbHb/EnJJ00IXuENeznKYk0n02o5+RASi0bUVN3CoPkBjLYUWlwnPlq0VLy dSrk2uAx9m7k69Q1y7a68vbobixXpWoVdNymkxRm1K0fR77R47gUv01FdRrS8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=926e825ef823f49e371f61780634475a1f19c812 commit 926e825ef823f49e371f61780634475a1f19c812 Author: Warner Losh AuthorDate: 2022-01-09 17:13:58 +0000 Commit: Warner Losh CommitDate: 2022-01-09 17:13:58 +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 --- 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