summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-12-04 18:43:39 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-12-04 18:43:39 +0000
commit3860d1b3ef807c648b69b445fa09673a84cd5086 (patch)
tree26d9f794ab23a83f5452239f4463f5e9413cfa43 /distrib/miniroot/install.sub
parent8887605b7f95a0c81fa9fbfbef0494cae6cd51ec (diff)
ask if sshd should be on by default (default to yes, still); tested by nick
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub12
1 files changed, 9 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 8d3c5a09304..086ff2ed468 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.321 2003/09/22 01:31:39 krw Exp $
+# $OpenBSD: install.sub,v 1.322 2003/12/04 18:43:38 deraadt Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1613,13 +1613,19 @@ populateusrlocal() {
fi
}
-set_machdep_apertureallowed() {
+questions() {
+ ask_yn "Do you wish sshd(8) to be started by default?" yes
+ if [[ $resp == n ]]; then
+ echo "sshd_flags=NO # disabled during install" \
+ > /mnt/etc/rc.conf.local
+ fi
+
[[ -n $MDXAPERTURE ]] || return
ask_yn "Do you expect to run the X Window System?" yes
if [[ $resp == y ]]; then
sed -e "/^#\(machdep\.allowaperture=${MDXAPERTURE}\)/s//\1 /" \
- /mnt/etc/sysctl.conf > /tmp/sysctl.conf
+ /mnt/etc/sysctl.conf > /tmp/sysctl.conf
fi
}