summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub12
-rw-r--r--distrib/miniroot/upgrade.sh3
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