From nobody Sat Dec 14 04:31:59 2024 X-Original-To: dev-commits-src-main@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 4Y9CwH4yv0z5gfsC; Sat, 14 Dec 2024 04:31:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9CwH41Tnz3xZ7; Sat, 14 Dec 2024 04:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150719; 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=ktHlTm4sdpBsgQF/ER3j72zvbGFL9k8Yo3ATLIqfjS4=; b=a+HFR8RttLyAojXj703RiJpWYXFeXribuK5rHGazVeurhj+ZqLoZgqxbie16JQElEtZRTK d01ERkFsI0FGtRY12M4rf79VYwz8mRRoyXlU5Q9I0sAHBq1EksxeVg/V1HXvwUmhv41M/P eBMn/JvtZ/u3hdhCEnAPUBNYK3oDziJ15UIl1EH5WUt7AxjDeCDCjC0K61yC3uK0zvYX52 BJxSmLPMcrq/Mh7DY7OCy4lz6WgiWnYUjLgXaSD6GjOR3UMZeGl9MLcVLHf6tsx25JXl6g 5jTRyGmsgZ9VThd2cHY8mXjvUnGeelG7mkHt7L8uGMapgPY4mNXz/XQeBWuVXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734150719; 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=ktHlTm4sdpBsgQF/ER3j72zvbGFL9k8Yo3ATLIqfjS4=; b=DhkvEEaAhFKyPh1dgrRyXl+hhC3Q5IlpGkDFsbyyzV234ME582U9/BR/bQOe1JHWXdYwYb CL+a/wfXRBHUBjVY5obI7pFN1992vorodpDG9fkvskvY5waRtbJQOwS6uWRpY+FXJqIpz3 AAOa2oO8sm6bk0+k3wKk3mJoPfKzjPeUQDUKTgHD6WAgbkrGssIsE89t2G6pQBuHW5vAq2 EcN3XOoPjimwG0B0iRDOta/Q5raq+BcLrZ1qLLUm4Nh8t57KwGJ/oTZjymC0ZJSY/cCmGr RujLxsABNc8ak8S1qXpDmP185LiFVcJj1rOtcXZEskYEXw3ocM8OqK7w5E5IqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734150719; a=rsa-sha256; cv=none; b=KWU8y9sWBIiab5PkK0VYdTX1xNVqNyNVd7AKkepQkX0anP/3y88Wzx5amsX01+3sa5QbHI tY1/E2W3mOFUA4yJH6AklVKEdzuoX3AafWGZvLXc85Ely8BYdJJL1RkGsIb4mn0+rI58ZK QpnDSAvOWimkwXTLZRHbl647tnnJ/DZif9esETT8WBjiMODcZgk44gpWoKiS4DWpQmu4w0 il69+bPx2Q2tRxmEsFFNR2o7HTvT3Qxjhq8gXZYG+HdVMfa4qC5XdLO7NZagfas+DFKhUO LUZsxIv+20SQVOjd8I2QIH6VrOVgQI+2RFOqcmze+9NB9ZPpFVIb42G5LRImbA== 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 4Y9CwH3cWtz16wX; Sat, 14 Dec 2024 04:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BE4VxUJ046971; Sat, 14 Dec 2024 04:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE4Vx9l046968; Sat, 14 Dec 2024 04:31:59 GMT (envelope-from git) Date: Sat, 14 Dec 2024 04:31:59 GMT Message-Id: <202412140431.4BE4Vx9l046968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 17aec740b0b2 - main - devmatch: do nothing if booted in safe mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17aec740b0b2112eb1803ca6d5ec8c8161f8dcae Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=17aec740b0b2112eb1803ca6d5ec8c8161f8dcae commit 17aec740b0b2112eb1803ca6d5ec8c8161f8dcae Author: Kyle Evans AuthorDate: 2024-12-14 04:31:22 +0000 Commit: Kyle Evans CommitDate: 2024-12-14 04:31:38 +0000 devmatch: do nothing if booted in safe mode Safe mode may be enabled because of some problem discovered with a kmod, thus wanting to avoid devmatch. Honor it and let the user deal with the fallout of not autoloading modules. We've at least made it to userland and the user demonstrably has a local console as they selected safe mode in the first place, so this shouldn't be fatal if we don't, e.g., load a necessary NIC driver. --- libexec/rc/rc.d/devmatch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch index 0999159bb332..7a8726de5677 100755 --- a/libexec/rc/rc.d/devmatch +++ b/libexec/rc/rc.d/devmatch @@ -41,7 +41,10 @@ one_nomatch="$2" devmatch_start() { - local x m list + local x m list boot_safe + + boot_safe=$(kenv -q boot_safe || echo "NO") + checkyesno boot_safe && return if [ -n "$one_nomatch" ]; then list=$(devmatch -p "${one_nomatch}" | sort -u)