Module Name: src
Committed By: christos
Date: Sat Apr 7 05:40:42 UTC 2012
Modified Files:
src/sys/arch/i386/conf: GENERIC
Log Message:
add apple autodiscovery
To generate a diff of this commit:
cvs rdiff -u -r1.1068 -r1.1069 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1068 src/sys/arch/i386/conf/GENERIC:1.1069
--- src/sys/arch/i386/conf/GENERIC:1.1068 Sat Mar 24 20:11:16 2012
+++ src/sys/arch/i386/conf/GENERIC Sat Apr 7 01:40:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1068 2012/03/25 00:11:16 nonaka Exp $
+# $NetBSD: GENERIC,v 1.1069 2012/04/07 05:40:41 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.1068 $"
+#ident "GENERIC-$Revision: 1.1069 $"
maxusers 64 # estimated number of users
@@ -151,9 +151,10 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
-# The following two options can break /etc/fstab, so handle with care
+# The following three options can break /etc/fstab, so handle with care
#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
file-system NFS # Network File System client
