diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-05-20 16:53:58 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-05-20 16:53:58 +0000 |
| commit | 003d8bc2fc70b12651a30fc2eca63cc277fe8846 (patch) | |
| tree | 32ad9c5a2c1f65d569b49edd93309567efd115f8 /distrib/sparc64/common/install.md | |
| parent | f919b8c68c5deed11e04734f7e6fd07a714cdd55 (diff) | |
Eliminate md_questions(). It was used only to control the setting of
machdep.allowaperture. Remove the setting of machdep.allowaperture
from md_installboot().
Add MDXAPERTURE variable to relevant architectures.
Add a new function set_machdep_allowaperture(). It is called *after*
install_sets() (which changes when the X Window question is asked), and
if MDXAPERTURE is present modifies sysctl.conf.
Shrinks overall size for i386, macppc, sparc64 (which used md_questions
for machdep.allowaperture) but increases size a bit for other
architectures since set_machep_allowaperture is in install.sub.
Diffstat (limited to 'distrib/sparc64/common/install.md')
| -rw-r--r-- | distrib/sparc64/common/install.md | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md index 01c892f5c8c..8cd823baf46 100644 --- a/distrib/sparc64/common/install.md +++ b/distrib/sparc64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.11 2002/05/18 17:56:03 krw Exp $ +# $OpenBSD: install.md,v 1.12 2002/05/20 16:53:57 krw Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -43,21 +43,12 @@ # Machine-dependent install sets MDSETS=kernel MDTERM=sun +MDXAPERTURE=1 ARCH=ARCH md_set_term() { } -md_questions() { - echo - ask "Do you expect to run the X Window System?" y - case "$resp" in - y*|Y*) xfree86=y - ;; - esac - echo -} - md_installboot() { local _rawdev _prefix @@ -91,14 +82,6 @@ md_installboot() { fi echo Copying ofwboot... cp ${_prefix}/ofwboot /mnt/ofwboot - if [ "$xfree86" = y ]; then - echo - echo "Enabling machdep.allowaperture. Read xf86(4) for more information." - echo '1,$s/^#machdep\.allowaperture=1/machdep\.allowaperture=1 / -w -q' | ed /mnt/etc/sysctl.conf 2> /dev/null - echo - fi } md_checkfordisklabel() { |