From nobody Sun Nov 14 14:41:49 2021 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 2D433185C6EB; Sun, 14 Nov 2021 14:41:50 +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 4HsZlf0PHlz3mhZ; Sun, 14 Nov 2021 14:41:50 +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 E0C526B; Sun, 14 Nov 2021 14:41:49 +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 1AEEfnFO037930; Sun, 14 Nov 2021 14:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AEEfn7W037929; Sun, 14 Nov 2021 14:41:49 GMT (envelope-from git) Date: Sun, 14 Nov 2021 14:41:49 GMT Message-Id: <202111141441.1AEEfn7W037929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: d4874307fd5d - main - 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/main X-Git-Reftype: branch X-Git-Commit: d4874307fd5dc825e8a80adf7a531ed4bc43f235 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d4874307fd5dc825e8a80adf7a531ed4bc43f235 commit d4874307fd5dc825e8a80adf7a531ed4bc43f235 Author: Emmanuel Vadot AuthorDate: 2021-11-14 14:22:14 +0000 Commit: Emmanuel Vadot CommitDate: 2021-11-14 14:41:30 +0000 loader: Fix pnpload and add some usage pnpload needs a busname and a compat data. --- 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) {