KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fdisk: Remove support for vinum volumes

Browse Source 
Reviewed by:	imp, emaste
Differential Revision:	https://reviews.freebsd.org/D48537
This commit is contained in:
John Baldwin
2025-01-23 10:33:10 -05:00
parent e51036fbf3
commit 2b12e6676a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sbin/fdisk/fdisk.c
+1 -2
View File
@@ -1472,7 +1472,6 @@ sanitize_partition(struct dos_partition *partp)
* The following choices are considered: * The following choices are considered:
* /dev/ad0s1a => /dev/ad0 * /dev/ad0s1a => /dev/ad0
* /dev/da0a => /dev/da0 * /dev/da0a => /dev/da0
* /dev/vinum/root => /dev/vinum/root
* A ".eli" part is removed if it exists (see geli(8)). * A ".eli" part is removed if it exists (see geli(8)).
* A ".journal" ending is removed if it exists (see gjournal(8)). * A ".journal" ending is removed if it exists (see gjournal(8)).
*/ */
@@ -1489,7 +1488,7 @@ get_rootdisk(void)
if (statfs("/", &rootfs) == -1) if (statfs("/", &rootfs) == -1)
err(1, "statfs(\"/\")"); 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) REG_EXTENDED)) != 0)
errx(1, "regcomp() failed (%d)", rv); errx(1, "regcomp() failed (%d)", rv);
strlcpy(dev, rootfs.f_mntfromname, sizeof (dev)); strlcpy(dev, rootfs.f_mntfromname, sizeof (dev));