summaryrefslogtreecommitdiff
path: root/distrib/i386/common
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2010-08-08 21:06:07 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2010-08-08 21:06:07 +0000
commit34919281a13ccd6bd7e93e33da1c0a82d307a092 (patch)
treea91483fdbfbd4b46cfbfa3820f9f53fa3ad5d340 /distrib/i386/common
parent15daa0713cadfe1d2c7f4a2a575545cedba90b14 (diff)
Revert auto-enabling of apm. Some security implications were not
fully appreciated, and no time to work through them. ok deraadt@
Diffstat (limited to 'distrib/i386/common')
-rw-r--r--distrib/i386/common/install.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 130a005c45d..ba5b11e9c81 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.48 2010/08/08 17:02:14 krw Exp $
+# $OpenBSD: install.md,v 1.49 2010/08/08 21:06:06 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,6 @@
MDXAPERTURE=2
MDXDM=y
-MDAPMD="^apm0 |^acpi0: sleep .* S3"
NCPU=$(sysctl -n hw.ncpufound)
((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; }