diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-12-04 18:43:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-12-04 18:43:39 +0000 |
| commit | 3860d1b3ef807c648b69b445fa09673a84cd5086 (patch) | |
| tree | 26d9f794ab23a83f5452239f4463f5e9413cfa43 | |
| parent | 8887605b7f95a0c81fa9fbfbef0494cae6cd51ec (diff) | |
ask if sshd should be on by default (default to yes, still); tested by nick
| -rw-r--r-- | distrib/miniroot/install.sh | 6 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 1bc300a773b..fa70c36e403 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.139 2003/11/03 05:16:21 david Exp $ +# $OpenBSD: install.sh,v 1.140 2003/12/04 18:43:38 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -375,8 +375,8 @@ while read _dev _mp _fstype _opt _rest; do mount -u -o $_opt $_dev $_mp || exit done < /etc/fstab -# Create /tmp/sysctl.conf from installed sysctl.conf if appropriate. -set_machdep_apertureallowed +# Handle questions... +questions echo -n "Saving configuration files..." 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 } |