From nobody Fri Jun 17 14:54:14 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 657BC8349C8; Fri, 17 Jun 2022 14:54:14 +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 4LPhrk2SnQz3mxH; Fri, 17 Jun 2022 14:54:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655477654; 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=c6WAiTQwnSBdnDc0pZ0c72+QRN6M4dda82inKNcFkqs=; b=JejPQHwbRFwl6ZsVABHYKh3jB7dBXjVqBCxIEQy+r5U/FIbwgIIeq5V/k6Iydwbv4qZqbO NRCVD6+4pvHxg36SjaCVJyJrwMuidv2lB88NKlAqC/VMjXy4R6Vmdw8Ig3unc3MhirXHx0 J+s2ySOxEEI2d3c/sbUNbyKXq1k08Rgs2pOloVPphOwyorGtvGH+GoymvaXJ+fh7XFfSFY VKHq7UQ84ppDmXjxZmkbT+q4spVOoaJNUIS8H+X12qVbpbK+uTu82QHkcWd7DktVyciGmo R41fHG8M925ojnQCESPz86W92Ivmx+oTFoyrcVXyTCmXC0YT0rjexvm5UnMN5Q== 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 3419721925; Fri, 17 Jun 2022 14:54:14 +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 25HEsEAe029885; Fri, 17 Jun 2022 14:54:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HEsEkw029884; Fri, 17 Jun 2022 14:54:14 GMT (envelope-from git) Date: Fri, 17 Jun 2022 14:54:14 GMT Message-Id: <202206171454.25HEsEkw029884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: ad0a7ea65084 - main - kldload: Bring functionality in line with manual page 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: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad0a7ea65084e997f21fdb4724120e850b20659b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655477654; 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=c6WAiTQwnSBdnDc0pZ0c72+QRN6M4dda82inKNcFkqs=; b=Y4uoVdVBzI07plvaYVE/P/ACJQi3QkVPRO7o609AaCkziisH1Z8efRB4WOh0Yf47Ldq5m4 o0k44IM+HP0QX/hW6gZbM+TuHtTVul5hzIkLWUsQpzaPxccU2ObDN/YkcMvVhRNIRcAjAv f4tX2jDdPdORPeY2j/rHItOIFYHlZJlJoJ3bfTlaNsQuOd1TW7fEpoDG/NksDzQxIANiSK wXM+S0toDS/ntWvcLD8dNJdKAOblBfPe+i25krTXZg0qonpfVH590c/ExqAMjxqEZGf1Xg CDycHF05gbdDvulw5bPHDSwKONzIuwHkI9wybaEiz2uwtT7ufWkKLzJHAwOmJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655477654; a=rsa-sha256; cv=none; b=vIOKltJtddn6ayLcFyGMNjWGyRVToXyihY04bYjYPb+jtLS2PQM24U4Fa9mW5RH2JGC7uP dxQMEULB44f5Xp3bZbDWz05wi/j2GpS0f9b3qkzlkKMevx7v0RgsKmpMZMit2R+Yoe2nSb YBQnHt92h4llMweO6mijuZ3Z25R7nIMibXCiDGiEkbYLQQrG5UeI5pIVM/IckB9AzhHglc MTnVmDhXkTAOsxNQHcqrnSQNOEaOWDQbZp01XZ6rjNSXMzHHyyOKL2KyiEOboCjO4EOJXM kHpoUpSJ9Drd3yzPWHTVRMuUBvoITgtTw0dO1Hs1V+b8aQQdoFFUwUPPf9WNfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=ad0a7ea65084e997f21fdb4724120e850b20659b commit ad0a7ea65084e997f21fdb4724120e850b20659b Author: Juraj Lutter AuthorDate: 2022-06-17 13:36:53 +0000 Commit: Juraj Lutter CommitDate: 2022-06-17 14:53:28 +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 --- 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++; }