From nobody Sun Jun 1 00:42:29 2025 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 4b8yqT6pfpz5xnZM; Sun, 01 Jun 2025 00:42:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8yqT38lGz3TLb; Sun, 01 Jun 2025 00:42:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748738549; 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=MQ9b1yLP+foQUrpQdKKlg75kCWdu8tK6XT+wg6/W44s=; b=kCT/PLQtX0eWE0IQfUUUuOAblLfS5bPp0MQW1sbqEA2eNjUPwvfDP0v996kt/KJgyVTFnK IXIEqy0LZ5O8lqof25+U35DF1qtqqUCWQYMWsNiYgxLGHoeZMtuiSwl4Q+XcbpAne77hUW BCbWBRDx5UA5FLLwmhqa6T/zquaQq0/wL8/o5W6zmmeq6v+msKX4NUQormWO4J1qQnGFTw PHOb1drAilAu2BGa0acQv+TqYnUfBR92qcbAclMvw0u7JU//H6BOVTV8dal5Xu8wxFX9Pi cN8uSbQ6S4IrraErO+V7qW2oGsx6lcIYJc7ty+cBKaQ8DbO647jtK+Jr2PJbHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748738549; 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=MQ9b1yLP+foQUrpQdKKlg75kCWdu8tK6XT+wg6/W44s=; b=Qi72pSsnTxIXGmBEIg7p3ntftsj8SDSHbV5TC5QJAHmXavX+uwIQYKe8ZfZ1zBWB3PUh9k y7DN0eR487k6SOoY4xGT0+2RlvSnU187Pj8dwRs1WGpBiQc6uxivErEMpmxXJWYkz3ZHzp MogkxQNx2ritpKgwWMehLSAEQp+hiMYVS7hDbQuAarRJH0TKfybC/cIaTKPpOqqKaxHfzT kK+/FlHrM7ATP4dfsJpiiH2qkkoS3uzhaQeaRE4LXALFb+A65DnXAwNiFQIW8f1SdeSWjo hQ2/ZwtCoBzD8LTfVoa9iF1s9YmVOjWwj8Sa3aSyCQtv+dTMbv0UB/XVgzxDBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748738549; a=rsa-sha256; cv=none; b=FnBgbyzJSs6qf0u8LQbSZ8NO1OrOGzx7vqWElEfYi9GjJZ1QRo8VY9W9B2vYYdA2vPiOly 8wsd5q31zrWy6A4QBd/MamNtXSNZ5mRI1qruLYrQlaUnlG4ZiAmhqozKqYFHH2OghYCsT5 5IIcJtSYCCM/+Gdunha59MhwHQgRJBgRjcC9wFRqFzFba57TiyWALQxev3Z79hqj+jmXB1 2A4EPcDGzngMjimnH2Omwd6A77LEU202GEcIQbFt7NOpJxgJOHhFiuTYoMm6M8mISRcrZk lGLSK4AqUtyQYfy7YTHYxMLUEzH3Mf6DVMeXWO9137ze1AgOc6AGX6Eeza2Zvg== 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 4b8yqT2HwXz11hR; Sun, 01 Jun 2025 00:42:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5510gTV0073728; Sun, 1 Jun 2025 00:42:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5510gT8k073725; Sun, 1 Jun 2025 00:42:29 GMT (envelope-from git) Date: Sun, 1 Jun 2025 00:42:29 GMT Message-Id: <202506010042.5510gT8k073725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c6f345bda517 - stable/14 - pkg/FreeBSD.conf: Fix comments to reflect -kmods 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6f345bda5171ce879caa2d588d24ffb5aff37d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c6f345bda5171ce879caa2d588d24ffb5aff37d2 commit c6f345bda5171ce879caa2d588d24ffb5aff37d2 Author: Colin Percival AuthorDate: 2025-05-29 23:40:30 +0000 Commit: Colin Percival CommitDate: 2025-06-01 00:42:17 +0000 pkg/FreeBSD.conf: Fix comments to reflect -kmods Now that this file lists two repositories, the text "to disable *this* repository" no longer makes sense. Also, expand the example to list how to disable both FreeBSD and FreeBSD-kmods repositories. Reported by: Graham Perrin MFC after: 3 days (cherry picked from commit 955ab1a8f21ec1a662a87fc5e76e6d5690e09085) --- usr.sbin/pkg/FreeBSD.conf.latest | 5 +++-- usr.sbin/pkg/FreeBSD.conf.quarterly | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index b7b528bc3756..2175a3387437 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -1,9 +1,10 @@ # -# To disable this repository, instead of modifying or removing this file, -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# To disable a repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.: # # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# echo "FreeBSD-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD: { diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 2050350baa1f..bd0ee13b9b43 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -1,9 +1,10 @@ # -# To disable this repository, instead of modifying or removing this file, -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# To disable a repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.: # # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# echo "FreeBSD-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD: {