From nobody Fri Jul 01 15:21:01 2022 X-Original-To: dev-commits-src-branches@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 6FC708A8BA0; Fri, 1 Jul 2022 15:21:01 +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 4LZJn92lSVz4l5h; Fri, 1 Jul 2022 15:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656688861; 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=rLIauwwZxDWp+PJDh1VDlmQAMQo3OK6zJTT8+ED07Eg=; b=UGUrV0v1rp6Nqv3uS7QycKU/BcskQZTGIXaCso1T5XaNGXtPZbw/8urzqrF0P5qkbjrR62 ocYLrmbund5dKFgdogQZNfOTfUdo45bc27hKL3SgDl+R5ZRotseGm44JNomg63HByruMEV EYU8EG72BBgCy0lBmzzKHRUolAsudQH9RRxaCBcBjqnOFukknxL5v5TGXMED7Ed28CtgMV fHIvLR8q+6f6u5/i3+aqVjf2kezwktGJhwgHiLFIk9v4ZOsHIJUoiv2d3FPBM5uPr44BaU 95CCdh+vH49gLRK9WHrFHjJmak+HH0/gGBepJKsJ5YmlhFrR1aBEqvqn/5NLHw== 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 3E4421DA4D; Fri, 1 Jul 2022 15:21:01 +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 261FL1cA095824; Fri, 1 Jul 2022 15:21:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261FL1YB095823; Fri, 1 Jul 2022 15:21:01 GMT (envelope-from git) Date: Fri, 1 Jul 2022 15:21:01 GMT Message-Id: <202207011521.261FL1YB095823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Juraj Lutter Subject: git: 7c500f98b8d3 - stable/13 - kldload: Bring functionality in line with manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7c500f98b8d3068ef3601819c819266a8dbbba11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656688861; 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=rLIauwwZxDWp+PJDh1VDlmQAMQo3OK6zJTT8+ED07Eg=; b=GoELrvA3/IkLVuhB+Pj1XP2PIBzWk+6ZVBspM1tQ7Fyh2EA837Gybt7e9dGOBJmkM6dbe/ I1/UXpt5Pgod0FcvIO7R0sbCR3NGCoSxWnBasErBf54JQJpnuBTopjFLNu7HzGNwSrnFBk LuMkj1tDPc6k4HptjIAb2uRHP89kM6yKzF4zsyeBi7EPnWufhijGFtC1Q+1ZQyP/KCieOY all/nM5HOf30yyI6g6oJ5x0uaeIS+cw/+EgM9zUIfFodl9Wys2F4apkuIFnX1pZvjadGPe u8IaiND2/rJEOIqpu6YVtOuHoM+rV/AABtbTtNtRWVTRlL6zoqCYbz7PFoKUUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656688861; a=rsa-sha256; cv=none; b=V97zH4e6iV4ZqpM9eR8MGJXQgKhJ+lc/DL8QUa/C40JUwV/tPIf/iQQAhjzaFTe27Bo+gZ NpRsT3jtq75mg2f1UzVI9f2kS168cIQ1R3OIONbr5hnjAtL9+67TnT8p3Lz1brQPTPArUj l0veg+8tLSpgN5jjUjPF861RwSd33nsVYsmrmIUun38KUi7u0U42Cq42NPjLGQdp2BJJur 0pH8rLtxB0vP+8ozFqRmytjIJssQfgOOEObYcz+wBSvAEQVQv/gotwIUU0Q44Dj45XsvmQ ES0rqHeI9k71n3hUD47uceGtsodhJyckR9Xo+le/t32ILOSRgg8u0j04u+ovLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by otis (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=7c500f98b8d3068ef3601819c819266a8dbbba11 commit 7c500f98b8d3068ef3601819c819266a8dbbba11 Author: Juraj Lutter AuthorDate: 2022-06-17 13:36:53 +0000 Commit: Juraj Lutter CommitDate: 2022-07-01 15:16:22 +0000 kldload: Bring functionality in line with manual page Honor -q parameter and do not display any warning messages when -q is specified. Approved by: dfr MFC after: 2 weeks Sponsored by: Resulta, s.r.o. Differential Revision: https://reviews.freebsd.org/D35511 (cherry picked from commit ad0a7ea65084e997f21fdb4724120e850b20659b) --- sbin/kldload/kldload.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c index 254a409cd2a7..a8e43fdd1f92 100644 --- a/sbin/kldload/kldload.c +++ b/sbin/kldload/kldload.c @@ -171,21 +171,23 @@ main(int argc, char** argv) printf("%s is already " "loaded\n", argv[0]); } else { - switch (errno) { - case EEXIST: - warnx("can't load %s: module " - "already loaded or " - "in kernel", argv[0]); - break; - case ENOEXEC: - warnx("an error occurred while " - "loading module %s. " - "Please check dmesg(8) for " - "more details.", argv[0]); - break; - default: - warn("can't load %s", argv[0]); - break; + if (!quiet) { + switch (errno) { + case EEXIST: + warnx("can't load %s: module " + "already loaded or " + "in kernel", argv[0]); + break; + case ENOEXEC: + warnx("an error occurred while " + "loading module %s. " + "Please check dmesg(8) for " + "more details.", argv[0]); + break; + default: + warn("can't load %s", argv[0]); + break; + } } errors++; }