diff options
| -rw-r--r-- | distrib/amd64/common/install.md | 3 | ||||
| -rw-r--r-- | distrib/i386/common/install.md | 3 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 9 | ||||
| -rw-r--r-- | distrib/zaurus/ramdisk/install.md | 3 |
4 files changed, 4 insertions, 14 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 54c7cf591bb..1d912e8d398 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.24 2010/08/08 17:02:14 krw Exp $ +# $OpenBSD: install.md,v 1.25 2010/08/08 21:06:06 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,7 +34,6 @@ MDXAPERTURE=2 MDXDM=y -MDAPMD="^acpi0: sleep .* S3" NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } 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" ; } 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}/" \ diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md index c9d747badda..05b06e27447 100644 --- a/distrib/zaurus/ramdisk/install.md +++ b/distrib/zaurus/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.25 2010/08/08 17:02:14 krw Exp $ +# $OpenBSD: install.md,v 1.26 2010/08/08 21:06:06 krw Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -33,7 +33,6 @@ # MDXDM=y -MDAPMD=y md_installboot() { } |