summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2015-07-23 00:38:04 +0000
committerderaadt <deraadt@openbsd.org>2015-07-23 00:38:04 +0000
commitc0ba7cd1331ddec68efa933ad1a370eed37bdf1f (patch)
tree1db0757fa25cdd9737be2259938ae397cdcad74b
parentImplement quoting support in doas.conf. Now you can pass environment (diff)
downloadwireguard-openbsd-c0ba7cd1331ddec68efa933ad1a370eed37bdf1f.tar.xz
wireguard-openbsd-c0ba7cd1331ddec68efa933ad1a370eed37bdf1f.zip
GPT appears to create broken spoofed labels for empty disks (at least vnd,
maybe related to the small size of such media)
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 33e8361c22d..ee56d0bd533 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.391 2015/07/21 03:38:22 reyk Exp $
+# $OpenBSD: GENERIC,v 1.392 2015/07/23 00:38:04 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -22,7 +22,7 @@ option MTRR # CPU memory range attributes control
#option KGDB # Remote debugger support; exclusive of DDB
#option "KGDB_DEVNAME=\"com\"",KGDBADDR=0x2f8,KGDBRATE=9600
-option GPT # GPT partition table support
+#option GPT # GPT partition table support
option NTFS # NTFS support
option HIBERNATE # Hibernate support
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a2378e6fc4d..91743e1c8be 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.801 2015/07/21 03:38:22 reyk Exp $
+# $OpenBSD: GENERIC,v 1.802 2015/07/23 00:38:06 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -26,7 +26,7 @@ option MTRR # CPU memory range attributes control
option COMPAT_LINUX # binary compatibility with Linux
-option GPT # GPT partition table support
+#option GPT # GPT partition table support
option NTFS # NTFS support
option HIBERNATE # Hibernate support