Disable BSDLABEL and MBR DKWEDGE methods again since sysinst does not work

with wedges.
This commit is contained in:
christos 2014-09-19 15:24:24 +00:00
parent ec7934705e
commit c7032b5d9a
13 changed files with 47 additions and 47 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: ALL,v 1.18 2014/08/24 07:59:22 jnemeth Exp $
# $NetBSD: ALL,v 1.19 2014/09/19 15:24:24 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "ALL-$Revision: 1.18 $"
#ident "ALL-$Revision: 1.19 $"
maxusers 64 # estimated number of users
@ -160,8 +160,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.397 2014/09/18 14:58:22 wiz Exp $
# $NetBSD: GENERIC,v 1.398 2014/09/19 15:24:24 christos Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.397 $"
#ident "GENERIC-$Revision: 1.398 $"
maxusers 64 # estimated number of users
@ -132,8 +132,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.106 2014/08/23 20:26:56 dholland Exp $
# $NetBSD: XEN3_DOM0,v 1.107 2014/09/19 15:24:24 christos Exp $
include "arch/amd64/conf/std.xen"
@ -81,8 +81,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOMU,v 1.57 2014/08/23 20:26:56 dholland Exp $
# $NetBSD: XEN3_DOMU,v 1.58 2014/09/19 15:24:24 christos Exp $
include "arch/amd64/conf/std.xen"
@ -75,8 +75,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: ALL,v 1.384 2014/08/23 21:05:39 dholland Exp $
# $NetBSD: ALL,v 1.385 2014/09/19 15:24:24 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "ALL-$Revision: 1.384 $"
#ident "ALL-$Revision: 1.385 $"
maxusers 64 # estimated number of users
@ -159,8 +159,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.1112 2014/09/18 14:58:21 wiz Exp $
# $NetBSD: GENERIC,v 1.1113 2014/09/19 15:24:24 christos Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.1112 $"
#ident "GENERIC-$Revision: 1.1113 $"
maxusers 64 # estimated number of users
@ -156,8 +156,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
file-system FFS # UFS

View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.88 2014/08/23 20:26:58 dholland Exp $
# $NetBSD: XEN3_DOM0,v 1.89 2014/09/19 15:24:24 christos Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@ -104,8 +104,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOMU,v 1.62 2014/08/23 20:26:58 dholland Exp $
# $NetBSD: XEN3_DOMU,v 1.63 2014/09/19 15:24:24 christos Exp $
include "arch/xen/conf/std.xen"
@ -90,8 +90,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.316 2014/08/24 07:59:23 jnemeth Exp $
# $NetBSD: GENERIC,v 1.317 2014/09/19 15:24:24 christos Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.316 $"
#ident "GENERIC-$Revision: 1.317 $"
maxusers 32
@ -87,8 +87,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_601,v 1.5 2014/08/24 07:59:23 jnemeth Exp $
# $NetBSD: GENERIC_601,v 1.6 2014/09/19 15:24:24 christos Exp $
#
# GENERIC machine description file
#
@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.601"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
ident "GENERIC-$Revision: 1.5 $"
ident "GENERIC-$Revision: 1.6 $"
maxusers 32
@ -79,8 +79,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.154 2014/08/23 20:26:59 dholland Exp $
# $NetBSD: GENERIC,v 1.155 2014/09/19 15:24:24 christos Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.154 $"
#ident "GENERIC-$Revision: 1.155 $"
maxusers 32
@ -83,8 +83,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.85 2014/08/24 07:59:23 jnemeth Exp $
# $NetBSD: GENERIC,v 1.86 2014/09/19 15:24:24 christos Exp $
#
# machine description file for GENERIC NAS
#
@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpoint"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.85 $"
#ident "GENERIC-$Revision: 1.86 $"
maxusers 32
@ -87,8 +87,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.62 2014/08/24 07:59:23 jnemeth Exp $
# $NetBSD: GENERIC,v 1.63 2014/09/19 15:24:24 christos Exp $
#
# GENERIC machine description file
#
@ -109,8 +109,8 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# Shared memory options