From nobody Fri Jul 1 15:28:02 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 EA6C28A9998; Fri, 1 Jul 2022 15:28:02 +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 4LZJxG6DMfz4lqq; Fri, 1 Jul 2022 15:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656689282; 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=2WWsIM95WNi4rAg0y/oP3hgRHRkOUTbcoezgpBqOP0M=; b=w35nHOyEfeDF6cbzIgxKbIQ9HJqRWqljHCZzyMAsv95fbok2lEQWVyfD+Sk68h992k+kKl tN+3kVsbH48PR5CulAzv8a578vFMb/Hl/+eXks1A6sDVZlRA0apf3Ghu03slo2tfretQAP mBtzVqhoWmb2NaOXm8OG2C6mkkXnAz/1TiYooxxMppo8INCxSwEeWTQ/aRatrdflPMYivO nqCxIFLDSFzuUETRTXJsmvnSobjcKahTW3Dvd6RKGrc9D5ueThhQxH3tRcAaGXZLX132vz yaSV0PYQUUKMA4sqn1sz5c/rRVa7vqxOFcveIFDUXQXOxUrSjTvKL2yysyjMbA== 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 B5C471DA6E; Fri, 1 Jul 2022 15:28:02 +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 261FS2GC099758; Fri, 1 Jul 2022 15:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261FS2cI099757; Fri, 1 Jul 2022 15:28:02 GMT (envelope-from git) Date: Fri, 1 Jul 2022 15:28:02 GMT Message-Id: <202207011528.261FS2cI099757@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: 43a212b5bdee - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 43a212b5bdeee503024cc9402c7fc74c2ead0777 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656689282; 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=2WWsIM95WNi4rAg0y/oP3hgRHRkOUTbcoezgpBqOP0M=; b=u1CrM7sMRXsw2lL4Kf7mKUUzA1IGip89rdCYErTUrQK92vYUOOdg5Pbg5FNtBVPt5Fy5VD FjeOqbhqNFivJxPfq7QTrL/o4RVvzKNTg1oGe3Jky6z92DF30sN3cv+I88atfyYgzm1lTe wRxcxTAVFeQulCh7TOl4RrficUOMZ07FiCEXMsBG4/IyAKDx9hxMVIEr4euYqwaB7uk2mg nItth2WaAfaFufoO0ev8u24nXFrY3LSdha2JDIxpCsWwdRyvN8IKpG5G3lh5jo0KADYTHV HVz8v/NrAimsoxD0wBUqWnJofLKPHZ2fMeD5Rt3ggQd3DhBQT3U1SzqMwNTwzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656689282; a=rsa-sha256; cv=none; b=Ax/VujLDENsy/UI0EAsV5nROisYGNqzI+tMFHa7HMu30IqsqSHtiUeaaH5awQovekNcp2h UypK1j/QrR+U6dDHwE/ei95R91pKopoHZ2fglAlUn5suZMaNRVbhr98FXo4elsfACi7npE mCYVrz/FxdjEnyKUdg5WXVwwz3PltBTjk7pkqXh4NavoWqIAVwd++fmHgaDWdKZycfMOvZ gr53muZogpVdJuOYG7hzw8Z+QTx/H+Y1+rjCdC3gEMBUMGJpWR/P7ypHfhY/Lcs09vLPI9 TyFg1BJlY/r2lLWNcfYBtlMdCa3jKc6tCO4od6W44TYXLldKMv05NPW0rwdE7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by otis (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=43a212b5bdeee503024cc9402c7fc74c2ead0777 commit 43a212b5bdeee503024cc9402c7fc74c2ead0777 Author: Juraj Lutter AuthorDate: 2022-06-17 13:36:53 +0000 Commit: Juraj Lutter CommitDate: 2022-07-01 15:26:18 +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++; }