From nobody Fri Jan 14 13:42:08 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 D5CDD1940E05; Fri, 14 Jan 2022 13:42:09 +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 4Jb2Xd4j1Wz50R2; Fri, 14 Jan 2022 13:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642167729; 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=cqlEJyxZ1JNiJI7NXA1wkYEmxBNMywJ0zl09ebJ8XPE=; b=gxO8Sp4KfJB2VeMg1LQ9oUoT0RIardd6g6jJ1lPrgssJcrjghdI4BYYIIZwFSlkexw/b0m BTNMHrVSSPkS/qXOeGooJKF2Zp+KFDLzLdMPR4k0rM6FtQbmNuN/FjBv2lmFuinpBHh6GE 6yU6K+50jjievfFQsvbFVeFz9hdFgSBv6v2hKkwvgEkkVcWKvAHXBB1tUPD77lzzF85WtZ Wq0LcyJfd1X8mpgmIDcTLMgKgmS/qSAC5+G3U6i7CQukSIdBCcc1gEtShwYTZ+SLZG/O+q yJqezKN17rUkLKjiupEp9qGzrkgfcXu6B/WhTZd4zLGBKXlSZ5ejXjaK9LleYg== 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 C46F614BA6; Fri, 14 Jan 2022 13:42:08 +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 20EDg8uN034367; Fri, 14 Jan 2022 13:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EDg8CC034366; Fri, 14 Jan 2022 13:42:08 GMT (envelope-from git) Date: Fri, 14 Jan 2022 13:42:08 GMT Message-Id: <202201141342.20EDg8CC034366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: e52cb5ee22c7 - stable/13 - loader: Fix pnpload and add some usage 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e52cb5ee22c786864463e076eb97af51094f5dad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642167729; 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=cqlEJyxZ1JNiJI7NXA1wkYEmxBNMywJ0zl09ebJ8XPE=; b=MIBe2aNbmZ2AKI+TG5LPQAIgPX6x0ybkffSzOhJQR5QkZGEwHxIf5g2n3yTQz5AT1SezB7 fzEo/9Du3v3H48V7uNo5mUiz+HRFReiDmQheVvfoYv5NCKq0b61GAbH96yauFNO8DWdL+l c25tM6LAhQwMl/SmPfkVUMqncsn5hmYF5KqQkDgi9To3F8oxAz+T6RXYJzseYNeekMrVX5 XTwlurYUOVX8InfdvSyDgmiPtP9skWwzLvLKYll2yB3QPatExZEWsM77qH6arllzWOtSQ1 C9BsN/xj7ISPyEA4asVsMA/1ug+9lREX4PoVm3a1/eUrGqkyTHedV+DCgXxVag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642167729; a=rsa-sha256; cv=none; b=t+UvAow5JUgLKYyzIc14tkJ0gyNU/mnc6T/UQD4FIu6Ikm0UTt0dFzfzu54ymYUHQ9WuNy 2+o8KRIEz1hLO5d339zVzFRpHrydP9SsmEZswULm78oOYDPuNCco5s7mzjmn5NEoTIss1h 21OpRVDcSHmGtSwYbN92DKvYtUTHSuhrN01lNMLjAINjW+GoaGdhj2vl/WXarQBqgoX/5t x1VgbBezXUCh5r6k8/tj/qZwvJ0vdfF9uq5GEFRYrndBd26rJeKGRxG3B0oIr8NpPVs/+H tVVZyvbwmuvy41DUFeDZMigR7iG2dzZBj/+OKVw1GkFp7v3iFBOIhCJvefOq1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e52cb5ee22c786864463e076eb97af51094f5dad commit e52cb5ee22c786864463e076eb97af51094f5dad Author: Emmanuel Vadot AuthorDate: 2021-11-14 14:22:14 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-14 13:37:55 +0000 loader: Fix pnpload and add some usage pnpload needs a busname and a compat data. (cherry picked from commit d4874307fd5dc825e8a80adf7a531ed4bc43f235) --- stand/common/module.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stand/common/module.c b/stand/common/module.c index 9b001089149d..e6567c735f36 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -424,13 +424,15 @@ command_pnpload(int argc, char *argv[]) return(CMD_OK); } } - argv += (optind - 1); - argc -= (optind - 1); + argv += optind; + argc -= optind; - if (argc != 2) + if (argc != 2) { + command_errmsg = "Usage: pnpload compat="; return (CMD_ERROR); + } - module = mod_searchmodule_pnpinfo(argv[1], argv[2]); + module = mod_searchmodule_pnpinfo(argv[0], argv[1]); error = mod_load(module, NULL, 0, NULL); if (error == EEXIST) {