git: 67f8b6d985db - stable/13 - loader: GELI encrypted disk should still use device name disk
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Jul 2022 06:15:38 UTC
The branch stable/13 has been updated by tsoome:
URL: https://cgit.FreeBSD.org/src/commit/?id=67f8b6d985dbc85682d6f8b2dd5117068c19ca59
commit 67f8b6d985dbc85682d6f8b2dd5117068c19ca59
Author: Toomas Soome <tsoome@FreeBSD.org>
AuthorDate: 2022-06-20 06:51:44 +0000
Commit: Toomas Soome <tsoome@FreeBSD.org>
CommitDate: 2022-07-04 06:14:43 +0000
loader: GELI encrypted disk should still use device name disk
geli_probe_and_attach() does pick geli_devsw structure for
encrypted disks, the implementation depends on device
name "disk" when device type is DEVT_DISK, but geli_devsw is
setting name field "gelidisk".
PR: 264282
Submitted by: yamagi@yamagi.org
Reported by: yamagi@yamagi.org
(cherry picked from commit e417249016efcca73c9edad21b94b1315bc44601)
---
stand/libsa/geli/gelidev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c
index e1444c9b7fcd..d312d7b17e0e 100644
--- a/stand/libsa/geli/gelidev.c
+++ b/stand/libsa/geli/gelidev.c
@@ -53,7 +53,7 @@ static void geli_dev_cleanup(void);
* geli_devdesc, effectively routing all IO operations through our code.
*/
static struct devsw geli_devsw = {
- .dv_name = "gelidisk",
+ .dv_name = "disk",
.dv_type = DEVT_DISK,
.dv_init = geli_dev_init,
.dv_strategy = geli_dev_strategy,