Evolve the ctlreq interface added to geom_gpt into a generic

partitioning class that supports multiple schemes. Current
schemes supported are APM (Apple Partition Map) and GPT.
Change all GEOM_APPLE anf GEOM_GPT options into GEOM_PART_APM
and GEOM_PART_GPT (resp).

The ctlreq interface supports verbs to create and destroy
partitioning schemes on a disk; to add, delete and modify
partitions; and to commit or undo changes made.

4 files changed, 8 insertions, 7 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4e693f4..eee9c11 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -136,7 +136,6 @@ options 	MAXPHYS=(128*1024)
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 options 	GEOM_AES		# Don't use, use GEOM_BDE
-options 	GEOM_APPLE		# Apple partitioning
 options 	GEOM_BDE		# Disk encryption.
 options 	GEOM_BSD		# BSD disklabels
 options 	GEOM_CACHE		# Disk cache.
@@ -144,12 +143,13 @@ options 	GEOM_CONCAT		# Disk concatenation.
 options 	GEOM_ELI		# Disk encryption.
 options 	GEOM_FOX		# Redundant path mitigation
 options 	GEOM_GATE		# Userland services.
-options 	GEOM_GPT		# GPT partitioning
 options 	GEOM_JOURNAL		# Journaling.
 options 	GEOM_LABEL		# Providers labelization.
 options 	GEOM_MBR		# DOS/MBR partitioning
 options 	GEOM_MIRROR		# Disk mirroring.
 options 	GEOM_NOP		# Test class.
+options 	GEOM_PART_APM		# Apple partitioning
+options 	GEOM_PART_GPT		# GPT partitioning
 options 	GEOM_PC98		# NEC PC9800 partitioning
 options 	GEOM_RAID3		# RAID3 functionality.
 options 	GEOM_SHSEC		# Shared secret.
diff --git a/sys/conf/files b/sys/conf/files
index 2b42b56..6995d85 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1178,7 +1178,6 @@ geom/eli/g_eli_privacy.c	optional geom_eli
 geom/eli/pkcs5v2.c		optional geom_eli
 geom/gate/g_gate.c		optional geom_gate
 geom/geom_aes.c			optional geom_aes
-geom/geom_apple.c		optional geom_apple
 geom/geom_bsd.c			optional geom_bsd
 geom/geom_bsd_enc.c		optional geom_bsd
 geom/geom_ccd.c			optional ccd | geom_ccd
@@ -1188,7 +1187,6 @@ geom/geom_disk.c		standard
 geom/geom_dump.c		standard
 geom/geom_event.c		standard
 geom/geom_fox.c			optional geom_fox
-geom/geom_gpt.c			optional geom_gpt
 geom/geom_io.c			standard
 geom/geom_kern.c		standard
 geom/geom_mbr.c			optional geom_mbr
@@ -1213,6 +1211,10 @@ geom/label/g_label_ufs.c	optional geom_label
 geom/mirror/g_mirror.c		optional geom_mirror
 geom/mirror/g_mirror_ctl.c	optional geom_mirror
 geom/nop/g_nop.c		optional geom_nop
+geom/part/g_part.c		standard
+geom/part/g_part_if.m		standard
+geom/part/g_part_apm.c		optional geom_part_apm
+geom/part/g_part_gpt.c		optional geom_part_gpt
 geom/raid3/g_raid3.c		optional geom_raid3
 geom/raid3/g_raid3_ctl.c	optional geom_raid3
 geom/shsec/g_shsec.c		optional geom_shsec
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index b530346..af7ba29 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -32,7 +32,6 @@ dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-sc.c		optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/uart/uart_cpu_powerpc.c	optional	uart
-geom/geom_apple.c		standard
 kern/syscalls.c			optional	ktr
 powerpc/powerpc/atomic.S	standard
 powerpc/powerpc/autoconf.c	standard
diff --git a/sys/conf/options b/sys/conf/options
index c05e405..0abb459 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -74,7 +74,6 @@ DIRECTIO
 FULL_PREEMPTION	opt_sched.h
 IPI_PREEMPTION	opt_sched.h
 GEOM_AES	opt_geom.h
-GEOM_APPLE	opt_geom.h
 GEOM_BDE	opt_geom.h
 GEOM_BSD	opt_geom.h
 GEOM_CACHE	opt_geom.h
@@ -82,12 +81,13 @@ GEOM_CONCAT	opt_geom.h
 GEOM_ELI	opt_geom.h
 GEOM_FOX	opt_geom.h
 GEOM_GATE	opt_geom.h
-GEOM_GPT	opt_geom.h
 GEOM_JOURNAL	opt_geom.h
 GEOM_LABEL	opt_geom.h
 GEOM_MBR	opt_geom.h
 GEOM_MIRROR	opt_geom.h
 GEOM_NOP	opt_geom.h
+GEOM_PART_APM	opt_geom.h
+GEOM_PART_GPT	opt_geom.h
 GEOM_PC98	opt_geom.h
 GEOM_RAID3	opt_geom.h
 GEOM_SHSEC	opt_geom.h