diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-08-08 21:06:07 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-08-08 21:06:07 +0000 |
| commit | 34919281a13ccd6bd7e93e33da1c0a82d307a092 (patch) | |
| tree | a91483fdbfbd4b46cfbfa3820f9f53fa3ad5d340 /distrib/miniroot/install.sub | |
| parent | 15daa0713cadfe1d2c7f4a2a575545cedba90b14 (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/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d50be3b863f..42117e2ee47 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.616 2010/08/08 17:02:14 krw Exp $ +# $OpenBSD: install.sub,v 1.617 2010/08/08 21:06:06 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -68,7 +68,6 @@ # MDDKDEVS - '/^[sw]d[0-9][0-9]* /s/ .*//p' assumed if not provided # MDCDDEVS - '/^cd[0-9][0-9]* /s/ .*//p' assumed if not provided # MDMTDEVS - '/^[cms]t[0-9][0-9]* /s/ .*//p' -# MDAPMDEV - '' assumed if not provided # MDXAPERTURE - set machdep.allowaperture=value in sysctl.conf . install.md @@ -1757,12 +1756,6 @@ server $1 >>/mnt/etc/rc.conf.local fi - if [[ -n $MDAPMD ]]; then - [[ $MDAPMD == y || -n $(egrep "$MDAPMD" /var/run/dmesg.boot) ]] && \ - echo "apmd_flags= # enabled during install" \ - >>/mnt/etc/rc.conf.local - fi - if [[ $defcons == y ]]; then cp /mnt/etc/ttys /tmp/ttys sed -e "/^$CTTY/s/std.9600/std.${CSPEED}/" \ |