The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2b12e6676a00a9360844d39516692753bf776e94
commit 2b12e6676a00a9360844d39516692753bf776e94
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2025-01-23 15:33:10 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2025-01-23 16:20:43 +0000
fdisk: Remove support for vinum volumes
Reviewed by: imp, emaste
Differential Revision: https://reviews.freebsd.org/D48537
---
sbin/fdisk/fdisk.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index a2e1cdb76c6a..925cc68932d7 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1472,7 +1472,6 @@ sanitize_partition(struct dos_partition *partp)
* The following choices are considered:
* /dev/ad0s1a => /dev/ad0
* /dev/da0a => /dev/da0
- * /dev/vinum/root => /dev/vinum/root
* A ".eli" part is removed if it exists (see geli(8)).
* A ".journal" ending is removed if it exists (see gjournal(8)).
*/
@@ -1489,7 +1488,7 @@ get_rootdisk(void)
if (statfs("/", &rootfs) == -1)
err(1, "statfs(\"/\")");
- if ((rv = regcomp(&re,
"^(/dev/[a-z/]+[0-9]*)([sp][0-9]+)?[a-h]?(\\.journal)?$",
+ if ((rv = regcomp(&re,
"^(/dev/[a-z/]+[0-9]+)([sp][0-9]+)?[a-h]?(\\.journal)?$",
REG_EXTENDED)) != 0)
errx(1, "regcomp() failed (%d)", rv);
strlcpy(dev, rootfs.f_mntfromname, sizeof (dev));
