From: kn <kn@openbsd.org>
Date: Tue, 23 Aug 2022 16:08:09 +0000 (+0000)
Subject: Remove unused partition type patterns from disk_has() helper
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0d199dffe29f67db853de22878a0ff175384c59c;p=openbsd

Remove unused partition type patterns from disk_has() helper

softraid(4) patterns were never used since import in 2015
and only one out of APFS patterns are used.

Feedback on APFS krw
OK krw
---

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 06bb00daf11..5cbb70398bc 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.1203 2022/07/26 00:38:42 kn Exp $
+#	$OpenBSD: install.sub,v 1.1204 2022/08/23 16:08:09 kn Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -377,14 +377,11 @@ disk_has() {
 
 	# Commands to inspect disk. Default: "fdisk $_disk"
 	local _c_hfs="pdisk -l $_disk"
-	local _c_sr="bioctl -q $_disk"
 
 	# Patterns for partition-table-types and partition-types.
 	local _p_gpt='Usable LBA:'
 	local _p_gpt_openbsd='^[ *]...: OpenBSD '
-	local _p_gpt_apfs='^[ *]...: APFS '
 	local _p_gpt_apfsisc='^[ *]...: APFS ISC '
-	local _p_gpt_apfsrecovery='^[ *]...: APFS Recovery '
 	local _p_gpt_biosboot='^[ *]...: BIOS Boot '
 	local _p_gpt_efisys='^[ *]...: EFI Sys '
 	local _p_hfs='^Partition map '
@@ -394,8 +391,6 @@ disk_has() {
 	local _p_mbr_dos='^..: 06 '
 	local _p_mbr_dos_active='^\*.: 06 '
 	local _p_mbr_linux='^..: 83 '
-	local _p_sr='OPENBSD, SR'
-	local _p_sr_crypto='OPENBSD, SR CRYPTO'
 
 	# Compose command and patterns based on the parameters.
 	eval "_cmd=\"\$_c_${_pttype}\""