From nobody Tue May 07 07:40:49 2024 X-Original-To: dev-commits-src-main@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 4VYVZB0DQxz5KGG7; Tue, 07 May 2024 07:40: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 4VYVZ949hqz4Mmw; Tue, 7 May 2024 07:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715067649; 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=DgfJXHBhkjYBwvHkOI8EwfvS2rfPgV9xvAUrCIRHd0I=; b=HKboFMEIyg/X6RU7FN09hj+tjk+XCLMs/OdI3b2jMtOxKbgyabPOzsln5ZQCHiXRDBPP06 lII34Kibixj49QCY8EinrNuP8Az5f3LQoHwTBu4yAyDBjEXNhIO1pvXLM2fci7hoAWm4X6 hOq8PQzjHa4UfsYkSn9cO4i2ZNh6aNIrTQVA8YoIpBYEaiaLEM0D50qoCiT2cXkvdgci5H CBegKbb6DeO2eOXikVXF3S8frIOt6yfQx68iW3RS5Tp9RPZdftUM9PGdLXxuCdb274agtH j0pWQJv2y4f+itCXZtDVbCxTW/NnyIqdxcGo0eg9y+r9Y67xeuvTHCtef6H+sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715067649; a=rsa-sha256; cv=none; b=UAtplErCXbIPx+YJpcIlbHPaXFc7MsbKf9+EymgZ3E6TXIdlri4QlVYOp2JVPwVWLFDxzS sg+3gYNWDgyv3W1sFEglcJSgQRH7ZbT/NMUd2IGnhyeP2qrYUzizrQolUu6sVS1GNuNDoo mtaI+UxDaOMucPjhzYUnKeG/E9p2eRXWPtDSeUvWZutgeOUWhqijcG0hLQh8dDBaHNo+RX 2n6NaL1bdnZCkVEcxRviHuIXSVft3f9q3De4vFhHwPDDHFBbMUbTlwKXtIY2UCRKCnNJ+i HeWVmu648VjebxZsWNgdgFV/dn3VCfoc/IdNHaSeMv4kmBN8ccsfoZxeFfb/CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715067649; 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=DgfJXHBhkjYBwvHkOI8EwfvS2rfPgV9xvAUrCIRHd0I=; b=IcFz83jsOTOM9eN+wdGsgsWWIuxh2TEIIrrr9f0/lvlDjHKkWSgJVY8QLzTHj+j5QbGgOb awbmxgQZwdi1261pQ+jtc7+jaYiubztx6jIo/YxvgseJeXO4+q7RcopbLdEPYNYuJamUKs +N45i2CisXK3VJGkm5tvVCuf+65kcV4jq2P6kkNmEKF+i6SMrCQQDthUxkr7aS0+wzy74m GJ2ln74KlmSfF7h3THf4ifQC/kbzTkksTWmF/hghS6GxHdwxjHSI0pd3Pvj4RyEmZz/S8F fgyWABlMiG/gUrkzz7+kbv38+P1PKHraYbd73+tEUOqbsUcSs+c3FZAW6FeKEA== 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 4VYVZ93gZHzXrt; Tue, 7 May 2024 07:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4477enx9095081; Tue, 7 May 2024 07:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4477enBw095078; Tue, 7 May 2024 07:40:49 GMT (envelope-from git) Date: Tue, 7 May 2024 07:40:49 GMT Message-Id: <202405070740.4477enBw095078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 66bee50af774 - main - Remove cross-references to GBDE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66bee50af774673bfaeb4c66a5a82e0ac99e70a4 Auto-Submitted: auto-generated The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=66bee50af774673bfaeb4c66a5a82e0ac99e70a4 commit 66bee50af774673bfaeb4c66a5a82e0ac99e70a4 Author: Poul-Henning Kamp AuthorDate: 2024-05-07 07:35:33 +0000 Commit: Poul-Henning Kamp CommitDate: 2024-05-07 07:35:33 +0000 Remove cross-references to GBDE --- lib/geom/eli/geli.8 | 2 -- lib/geom/shsec/gshsec.8 | 1 - libexec/rc/rc.d/geli | 1 - sbin/ggate/ggatel/ggatel.8 | 18 ------------------ share/man/man4/disk.4 | 2 -- sys/sys/bufobj.h | 2 +- sys/sys/disk.h | 2 +- 7 files changed, 2 insertions(+), 26 deletions(-) diff --git a/lib/geom/eli/geli.8 b/lib/geom/eli/geli.8 index 098ba4d0485e..d34e15dc4ad8 100644 --- a/lib/geom/eli/geli.8 +++ b/lib/geom/eli/geli.8 @@ -1242,10 +1242,8 @@ after the first time a provider is attached and before it is initialized in this way. .Sh SEE ALSO .Xr crypto 4 , -.Xr gbde 4 , .Xr geom 4 , .Xr loader.conf 5 , -.Xr gbde 8 , .Xr geom 8 , .Xr crypto 9 .Sh HISTORY diff --git a/lib/geom/shsec/gshsec.8 b/lib/geom/shsec/gshsec.8 index 9430fde13c52..d4477de3a71e 100644 --- a/lib/geom/shsec/gshsec.8 +++ b/lib/geom/shsec/gshsec.8 @@ -116,7 +116,6 @@ detected and connected, making the secret available via the device. .Sh SEE ALSO .Xr geom 4 , -.Xr gbde 8 , .Xr geom 8 , .Xr newfs 8 .Sh HISTORY diff --git a/libexec/rc/rc.d/geli b/libexec/rc/rc.d/geli index 312d76a361ad..16d24efd1e39 100755 --- a/libexec/rc/rc.d/geli +++ b/libexec/rc/rc.d/geli @@ -44,7 +44,6 @@ geli_start() if [ -z "${geli_tries}" ]; then if [ -n "${geli_attach_attempts}" ]; then - # Compatibility with rc.d/gbde. geli_tries=${geli_attach_attempts} else geli_tries=`${SYSCTL_N} kern.geom.eli.tries` diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8 index 1ac41ed9eaa7..816a5b9a6e0e 100644 --- a/sbin/ggate/ggatel/ggatel.8 +++ b/sbin/ggate/ggatel/ggatel.8 @@ -125,27 +125,9 @@ To get details about the failure, should be called with the .Fl v option. -.Sh EXAMPLES -.Dq GEOMify -the -.Dq Li fd0 -device and use -.Xr gbde 8 -to encrypt data on a floppy disk. -.Bd -literal -offset indent -ggatel create -u 5 /dev/fd0 -gbde init /dev/ggate5 -gbde attach ggate5 -newfs /dev/ggate5.bde -mount /dev/ggate5.bde /secret -cp /private/foo /secret/ -umount /secret -gbde detach ggate5 -ggatel destroy -u 5 .Ed .Sh SEE ALSO .Xr geom 4 , -.Xr gbde 8 , .Xr ggatec 8 , .Xr ggated 8 , .Xr mount 8 , diff --git a/share/man/man4/disk.4 b/share/man/man4/disk.4 index 6451ff0e7370..a6316d3fd268 100644 --- a/share/man/man4/disk.4 +++ b/share/man/man4/disk.4 @@ -111,8 +111,6 @@ the case for multipathing for example, GEOM classes that consume a single provider and provide single provider, like .Xr geli 8 , -and -.Xr gbde 8 , the identifier should be formed by attaching that provider's class name to the ident of the underlying provider, .It diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h index d70327e31a37..a6a9c5c2bf01 100644 --- a/sys/sys/bufobj.h +++ b/sys/sys/bufobj.h @@ -33,7 +33,7 @@ * cache. * * This used to be vnodes, but we need non-vnode code to be able - * to use the buffer cache as well, specifically geom classes like gbde, + * to use the buffer cache as well, specifically geom classes like * raid3 and raid5. * * All vnodes will contain a bufobj initially, but down the road we may diff --git a/sys/sys/disk.h b/sys/sys/disk.h index 73ae5ce5756e..b8e29cef1de5 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -78,7 +78,7 @@ void disk_err(struct bio *bp, const char *what, int blkdone, int nl); * only if they point at exactly the same physical storage, this is * the case for multipathing for example, * - GEOM classes that consumes single providers and provide single - * providers, like geli, gbde, should just attach class name to the + * providers, like geli, should just attach class name to the * ident of the underlying provider, * - ident is an ASCII string (is printable), * - ident is optional and applications can't relay on its presence.