From nobody Mon Sep 29 01:48:03 2025 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 4cZkbl4Z93z68dxG; Mon, 29 Sep 2025 01:48:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cZkbl453gz3frM; Mon, 29 Sep 2025 01:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759110483; 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=/5ElgpImgPeMhKT2hnG0XwwGMrrzJkq6btBBtTQkCqI=; b=Ex4Vcj3J1avHjRrnlYfsiWvdypy3JxQk/BYQSOXp4BN0vngDqfZc8+rI2k4H5Yd411V8aV uN1dkivlZ63Ezc3ekyXUZzuVtjRMXcUc3YkTMZz5+ZYMvGZV5tdwlvwFmnYO9o8bJWiW8O Vlb5JJpat1TUX9rf3lOnV3iv7PiSU76BvBQpwjQ+WDul9e9UWfHbNXS8xAzwF1gGK1OlJT 40UN+X4VTPsKxwquTz3z5iq8NNrgyHKHnuxNvPV159AN33Vmhgca2YYPIcPt4Er0fv9/xn /P5Hz7tB1WmZeFkS8T5uHjT7CRPDYwK4l1VnEYkvARQxleOIZWRBRNtseCtdGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759110483; 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=/5ElgpImgPeMhKT2hnG0XwwGMrrzJkq6btBBtTQkCqI=; b=YAF7JlQGGahWzqXUc2bJ+Z2l8/Z2PLXIGZHDbDFXxNLqZmENCI0qUK5EZWBBRu2mx2yq8b iINJKPWZ/dNJThX1JrmfogRruPJYuEltLZr/Zfgt0Syt+4o1Y1YLGIKxBc2H8ZC1iAGS+2 eXsFvZnqN6RO8jkFRCUl9r0aycBUaRLmf0YVNnAPSTLAEKIk3qlqdMG1PQPBSrM9Gs66Ny RwzxVRYNTJLlbU0pDkRSeCoT90euc8m0b7LUwCzMX+GSUL676afa9TE7d5ifvs4txu7EZU h/tgaGuKTktPqCpUhBHfYeNydeQDO2AIMgu/gUQ2eu9t6incHaQ0i46sVFStew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759110483; a=rsa-sha256; cv=none; b=li5eE+ubRoRhs29He+76uN70hw0WHN27XVK/B/v0Qw+Bkjm5zTHF8TxGJnOYHyspb25vCP 01E3Lvc+L+Jf5irgqd6Hrpo3v3lLxbCGbnWFA7Xiw9GvKOOY0zghTtQXeG0aiprAJRJtZz CRTBhgHWSAvM0Mepda5j5YunZHyPiadaV6FOF/7BNJlCkgIev03GXtsUYM3bmJ8QZqwDss vHne4MXYJu2jHYUf1+KEqY2aL4YPYkJOL3NzGT8j/SDHkK7BFuHtdAPX8Uh6t0rEqiRHT1 abuoDPeskzbxrJ1jH1Wz3pxFhqRODx8t5ODXXgXFBLtnrC5eN8eyfD4oHfukeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cZkbl3MN8zlC0; Mon, 29 Sep 2025 01:48:03 +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 58T1m39w063257; Mon, 29 Sep 2025 01:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58T1m3Qr063254; Mon, 29 Sep 2025 01:48:03 GMT (envelope-from git) Date: Mon, 29 Sep 2025 01:48:03 GMT Message-Id: <202509290148.58T1m3Qr063254@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: b7473a5d68b8 - main - loader: make disable-device more rebust 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7473a5d68b8ade1ce6c6c08965fe284cc70bd75 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b7473a5d68b8ade1ce6c6c08965fe284cc70bd75 commit b7473a5d68b8ade1ce6c6c08965fe284cc70bd75 Author: Warner Losh AuthorDate: 2025-09-28 17:58:31 +0000 Commit: Warner Losh CommitDate: 2025-09-29 01:45:01 +0000 loader: make disable-device more rebust Check the number of arguments and ensure that the passed-in device to disable parses correctly. Sponsored by: Netflix --- stand/lua/cli.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/stand/lua/cli.lua b/stand/lua/cli.lua index 596e55a8d1d8..dda8c3da4c89 100644 --- a/stand/lua/cli.lua +++ b/stand/lua/cli.lua @@ -235,9 +235,17 @@ cli["disable-device"] = function(...) return end + if #argv > 1 then + print("Too many arguments") + print("usage error: disable-device device") + return + end + d, u = string.match(argv[1], "(%w*%a)(%d+)") - if d ~= nil then + if d ~= nil and u ~= nil then loader.setenv("hint." .. d .. "." .. u .. ".disabled", "1") + else + print("Cannot parse " .. argv[1] .." into driver and unit number.") end end