From d654ea043b3abb2b97f8ec55e264e3ec987b3d09 Mon Sep 17 00:00:00 2001 From: marcel Date: Wed, 17 Dec 2008 17:43:22 +0000 Subject: [PATCH] Make gpart the default partitioning class on all platforms. Both ia64 and powerpc were using gpart exclusively already so there's no change for those two. Discussed on: arch@ --- sys/amd64/conf/DEFAULTS | 4 ++-- sys/arm/conf/DEFAULTS | 4 ++-- sys/arm/conf/EP80219 | 1 - sys/i386/conf/DEFAULTS | 4 ++-- sys/mips/conf/DEFAULTS | 4 ++-- sys/pc98/conf/DEFAULTS | 4 ++-- sys/sparc64/conf/DEFAULTS | 4 ++-- sys/sun4v/conf/DEFAULTS | 4 ++-- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index 3477cafdfd43..fac8dcebf5ce 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -16,5 +16,5 @@ device io # I/O device device uart_ns8250 # Default partitioning schemes -options GEOM_BSD -options GEOM_MBR +options GEOM_PART_BSD +options GEOM_PART_MBR diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS index 606e962053f0..591a0a14c8de 100644 --- a/sys/arm/conf/DEFAULTS +++ b/sys/arm/conf/DEFAULTS @@ -7,5 +7,5 @@ machine arm device mem -options GEOM_BSD -options GEOM_MBR +options GEOM_PART_BSD +options GEOM_PART_MBR diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219 index 8e2d6cb38ea0..8ce5b1644180 100644 --- a/sys/arm/conf/EP80219 +++ b/sys/arm/conf/EP80219 @@ -57,7 +57,6 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options GEOM_PART_GPT # GUID Partition Tables. -options GEOM_MBR # DOS/MBR partitioning options GEOM_LABEL # Providers labelization. options BOOTP diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 2450f82c8d42..1411f094c145 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -20,8 +20,8 @@ device io # I/O device device uart_ns8250 # Default partitioning schemes -options GEOM_BSD -options GEOM_MBR +options GEOM_PART_BSD +options GEOM_PART_MBR # enable support for native hardware options NATIVE diff --git a/sys/mips/conf/DEFAULTS b/sys/mips/conf/DEFAULTS index 18a9a26270ab..dc480cea27a0 100644 --- a/sys/mips/conf/DEFAULTS +++ b/sys/mips/conf/DEFAULTS @@ -9,5 +9,5 @@ device mem device uart_ns8250 -options GEOM_BSD -options GEOM_MBR +options GEOM_PART_BSD +options GEOM_PART_MBR diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS index 962c099c4067..c16a29b3b8dd 100644 --- a/sys/pc98/conf/DEFAULTS +++ b/sys/pc98/conf/DEFAULTS @@ -22,5 +22,5 @@ device uart_ns8250 #device uart_i8251 # Default partitioning schemes -options GEOM_BSD -options GEOM_PC98 +options GEOM_PART_BSD +options GEOM_PART_PC98 diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS index 910e61e804bd..38b2408bf449 100644 --- a/sys/sparc64/conf/DEFAULTS +++ b/sys/sparc64/conf/DEFAULTS @@ -14,8 +14,8 @@ device uart_sab82532 device uart_z8530 # Default partitioning schemes -options GEOM_BSD -options GEOM_SUNLABEL +options GEOM_PART_BSD +options GEOM_PART_VTOC8 # Let sunkbd emulate an AT keyboard by default. options SUNKBD_EMULATE_ATKBD diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS index ba7c5398da1f..610d65333a0a 100644 --- a/sys/sun4v/conf/DEFAULTS +++ b/sys/sun4v/conf/DEFAULTS @@ -9,5 +9,5 @@ machine sun4v device mem # Memory and kernel memory devices # Default partitioning schemes -options GEOM_BSD -options GEOM_SUNLABEL +options GEOM_PART_BSD +options GEOM_PART_VTOC8