From nobody Thu Jan 23 16:21:06 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 4Yf5m25BKCz5l8KL; Thu, 23 Jan 2025 16:21:06 +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 4Yf5m22nj1z3snt; Thu, 23 Jan 2025 16:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737649266; 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=cdwRJ15mmupKNV2CWa8LYt/RqDvWRysb6itBIJsHwJc=; b=s2kBPZk1ATXZVXZPe1/jNzygagKm1QYS9oSJb1RI3d9zhyO5vP8cWvqtLSgmPb+MsQIsGb d5OoGppmbiAKimvsZqjhm4wR93kB87o6lf1zWjvTdRp9aSemPU912Z4mdES5wxoru0w4yg g5xNJddGdh+holZ7QRMZLfYhG6yvVLbDJh/8isBVlU3hml1tKcewxJ24EyQUcGvhaKeTHj ss43C+6JI8r+EDHkwE+4xK4gf+whw0cSKBqfHB3vh+kzEACIzfWsN+lMgzi4JAozV+X2+4 WHAl8afjy/PqFrK8+lqpzV4ulUNfxGRzazACwQHUtfPUBDWgutpCeESCJXwGiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737649266; 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=cdwRJ15mmupKNV2CWa8LYt/RqDvWRysb6itBIJsHwJc=; b=WKhbGFC6sASZfn/2EL2uj5DkJN/aHk39OUNifiQJMmdvZqPQXieme0Ke4nt8RBhKENWC0t ZUVJYCO3g1d3Xr9N+/puIFaOZESZsLlOGAiN4y3ViQ41z1rCs7h3c47s2viZa6ApakE76g DZKHBG8SZmdkOKIU5pMA2PujwpzphurUSSzLT+7pre8Ji6HcZHvO6aJZlQWU+K/Pl3XoS6 UKVMloJQXKOaaIkun65zmkN+aWm+sJRK7wLBp7zL+oNOYkbUD9+bm1KRdNPQZnci5Qr5Mn ucaFhe+fY5ik43hf8CKZ5cAAbCZdbz8HOpEXX0/vdPgemLRqh3OJHnyoBVHHOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737649266; a=rsa-sha256; cv=none; b=thyu7kTj5CCQvXTs/WaEmI9yFgHXKqI5wBggMEceZ5ludEuWCRE4iIlgvvlFEjFvq9flaT GA5Zyw0CmJ7EvQ2WBomEnXYoNzTbgsnzJboe+XP6b5YqfC/z+izmJcpE7nEv7KwT6WTwUE mD15k/itbzU3t243jxVUDhIDj/amRfOsK2RsBrupeTbsU02vm7kXTHzH4E9sSdIGp3SXug 4Sl+IAeXwmj21aXOlzKb7wP2lsLF1AKN/L/TnXlpFJNBjVoIgxREVI2NhPog9KUhc5WgXc jvZcptBTGBwf79Zj49Q2qeqh8h7TBX0ZpjqjKJ4a8y2F+db4J068pll0kBaFuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yf5m22FDjzmkk; Thu, 23 Jan 2025 16:21:06 +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 50NGL6ib001093; Thu, 23 Jan 2025 16:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NGL62S001090; Thu, 23 Jan 2025 16:21:06 GMT (envelope-from git) Date: Thu, 23 Jan 2025 16:21:06 GMT Message-Id: <202501231621.50NGL62S001090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2b12e6676a00 - main - fdisk: Remove support for vinum volumes 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b12e6676a00a9360844d39516692753bf776e94 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2b12e6676a00a9360844d39516692753bf776e94 commit 2b12e6676a00a9360844d39516692753bf776e94 Author: John Baldwin AuthorDate: 2025-01-23 15:33:10 +0000 Commit: John Baldwin 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));