diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2012-04-21 10:17:27 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2012-04-21 10:17:27 +0000 |
| commit | 47a318d224ee964da4cf941b08d88f25feef875e (patch) | |
| tree | 70338b22d5bb884f49cd3321719b2359db83cd12 /distrib/miniroot | |
| parent | 237d39769253d1ac61d5938360366c39f2221a27 (diff) | |
remove the "Do you want to do any manual network configuration?" question.
there is barely ever a need to do so these days, I for one don't remember
ever using it, and we have a well documented way of escaping to a shell at
any point in the install process, which the installer conveniently points
out right at the beginning.
stumbled upon while reviewing the upcoming 2nd edition of Michael Lucas'
"Absolute OpenBSD"
ok sthen deraadt halex krw
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 12 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 21069d52d5f..ecf59430411 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.656 2012/03/12 22:45:39 halex Exp $ +# $OpenBSD: install.sub,v 1.657 2012/04/21 10:17:26 henning 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 @@ -486,14 +486,6 @@ showcols() { rm -rf -- $_cdir } -# Offer to shell out for manual network configuration, and do so if -# the user accepts the offer. -manual_net_cfg() { - ask_yn "Do you want to do any manual network configuration?" - - [[ $resp == y ]] && { echo "Type 'exit' to return to $MODE." ; sh ; } -} - # Create a device. # # $1 = name of the device to create. @@ -1840,8 +1832,6 @@ donetconfig() { done cp /tmp/resolv.conf /tmp/resolv.conf.shadow fi - - manual_net_cfg } populateusrlocal() { diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 20bb51c6a22..1ebe2cd18ab 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: upgrade.sh,v 1.71 2011/07/06 21:12:05 ajacoutot Exp $ +# $OpenBSD: upgrade.sh,v 1.72 2012/04/21 10:17:26 henning Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -71,7 +71,6 @@ THESETS="$THESETS site$VERSION-$(hostname -s).tgz" # Configure the network. enable_network -manual_net_cfg startftplist |