Henning Brauer <henn...@openbsd.org> wrote:
>While reviewing the upcoming second edition of Michael Lucas'
>"Absolute OpenBSD" I actually paid attention to the installer instead
>of my usual autopilot mode ;) and stumbled over the "Do you want to do
>any manual network configuration?" question. I think it is obsolete,
>useless and we should remove it. One, it is barely ever useful (I
>don't remember EVER using it), two, we have a documented way to escape
>to a shell at any point (the ! answer).
>
>pardon typos, net over 3G is a bit laggy at 250km/h with a tunnel
>every other minute.
>
>ok?
>
>Index: miniroot/install.sub
>===================================================================
>RCS file: /cvs/src/distrib/miniroot/install.sub,v
>retrieving revision 1.656
>diff -u -p -r1.656 install.sub
>--- miniroot/install.sub 12 Mar 2012 22:45:39 -0000 1.656
>+++ miniroot/install.sub 19 Apr 2012 13:20:11 -0000
>@@ -1,4 +1,4 @@
>-# $OpenBSD: install.sub,v 1.656 2012/03/12 22:45:39 halex Exp $
>+# $OpenBSD: install.sub,v 1.655 2011/11/22 14:02:14 krw Exp $
Diffing against old stuff?
Apart from that, ok halex@.
/Alexander
> # $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() {
>Index: miniroot/upgrade.sh
>===================================================================
>RCS file: /cvs/src/distrib/miniroot/upgrade.sh,v
>retrieving revision 1.71
>diff -u -p -r1.71 upgrade.sh
>--- miniroot/upgrade.sh 6 Jul 2011 21:12:05 -0000 1.71
>+++ miniroot/upgrade.sh 19 Apr 2012 13:20:11 -0000
>@@ -71,7 +71,6 @@ THESETS="$THESETS site$VERSION-$(hostnam
>
> # Configure the network.
> enable_network
>-manual_net_cfg
>
> startftplist
>
>
>--
>Henning Brauer, h...@bsws.de, henn...@openbsd.org
>BS Web Services, http://bsws.de
>Full-Service ISP - Secure Hosting, Mail and DNS Services
>Dedicated Servers, Rootservers, Application Hosting
