From nobody Tue Mar 29 23:54:24 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 DD3771A45009; Tue, 29 Mar 2022 23:54:24 +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 4KSmcw5ttMz4jNx; Tue, 29 Mar 2022 23:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648598064; 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=eSz0Nqn8nWQuMqgWsID0q9Qig3zuOsOJxNSVJkrCbH8=; b=LXAAbgx3xn1cdXHI2zxli7YiAki9ugTxB6isEu9h0OI7nfFygyyHaVHVOXuUIs7gNKphTU RmEddcyPWyX4guaNfd3ojTf1JYAedoJVbfkJD/M9P+KvcW4j6mMA/7tv33k7mJlMDZ+jmj u0V8GfxJvPgmd6W2bJtgYJPnB7qKFUNYXM7qf+A+jttywQQ0liVaPCMSR2E7vtOSlDCvg9 9LOwnUment/8//8PbOylt08kqAYBXNwt4CqbpkL7i8fW6D/M2wj9eRk+S2c+/P7TN/OFeL aADaPzTsGy6g3NbVO9K7X47kZ5n7WASdfTRQNNe5N70njPguaDOaeKDxqsWxYw== 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 AA4E6439; Tue, 29 Mar 2022 23:54:24 +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 22TNsO5u034408; Tue, 29 Mar 2022 23:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TNsOec034407; Tue, 29 Mar 2022 23:54:24 GMT (envelope-from git) Date: Tue, 29 Mar 2022 23:54:24 GMT Message-Id: <202203292354.22TNsOec034407@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: 713595ca498d - releng/13.1 - 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 713595ca498d66d8520d135ade1ae8202b1fcb9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648598064; 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=eSz0Nqn8nWQuMqgWsID0q9Qig3zuOsOJxNSVJkrCbH8=; b=L0tePjKR1WgxM9RDb1P+OxLo9Jgvvmo7eGpeKfjf6yDFauo36OnsTJi38NNyD8D4GAVcO8 J/vYy0E7Uq0OQuOzl5SqLmLsHnYiQ3+ab9MfSH3FLnaNTsVqX8ZyER3TgR0SvHdhZgL0jQ 8yzAX1btcEwbvAO8Y+ajY2tIG28dCDwASEBUMAZljLwAKGSN2ofaQn+L3xZWx06KtTyWjV cLHvxDcU5WS7Jkon8KMoLqE+fYFd+arpL/kNfUmXSFW5w0TxlLo5/Alez8JnWXs0THP1Zc bKQyE5uKDoiH/3VIgI79eex3G/Yj1DglEOTNQBNmXYTUnPrpWt2PmHx8P828RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648598064; a=rsa-sha256; cv=none; b=SamfOBgK56Iycw99cHqg55RaHCxzP8VXsUub96+k//wjq95KQaFa1T9k1iCHlwEaC6u/4l xu1yFDEPN5M9SZwQdHDv8T7bTJkBcUCwiYnIchU9IcKb5LpKrP8vG1v0lK+WAJncmara/n +6RtH/csZr/POtxZz15gQoMcPJlRtd1XZaxh1YSHAZlKftrDx8liyUyk5Umh4Wia5U2jcJ 2fM6pCGZv/PpKbkvJPwYTJW0rDBur6vmm8tJFH0fM3hCGReTmsXk7G6KPWzfxWbmTZARCo g4R6iIinMZ7lYWs8kr1qQj23WUoIKfGuxACOBhn+tr1t1+reTpV4nprLAP3/AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=713595ca498d66d8520d135ade1ae8202b1fcb9d commit 713595ca498d66d8520d135ade1ae8202b1fcb9d Author: Warner Losh AuthorDate: 2022-01-09 17:13:58 +0000 Commit: Warner Losh CommitDate: 2022-03-29 23:54:00 +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. Approved by: re@ (gjb) Sponsored by: Netflix (cherry picked from commit 926e825ef823f49e371f61780634475a1f19c812) (cherry picked from commit cb95daaa91895a74a2f6d2db0d0773517a34ab99) --- 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