diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-04-25 16:55:03 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-04-25 16:55:03 +0000 |
| commit | 663539710671a76b5a652925fde6e1984be0897a (patch) | |
| tree | 7bf057e89806367fab779ad289192019ca0c6c27 /distrib/miniroot/upgrade.sh | |
| parent | 71926dda08ca0d2ca5f6a70c612d98d0f5fc6f3e (diff) | |
Always configure the network (if any) during upgrades. Another question
bites the dust.
ok deraadt@
Diffstat (limited to 'distrib/miniroot/upgrade.sh')
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 8ac8f521c2f..484b4320b44 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,8 +1,8 @@ #!/bin/ksh -# $OpenBSD: upgrade.sh,v 1.65 2008/06/27 06:06:13 ray Exp $ +# $OpenBSD: upgrade.sh,v 1.66 2009/04/25 16:55:02 krw Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # -# Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback +# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -78,11 +78,9 @@ done hostname $(stripcom /tmp/myname) THESETS="$THESETS site$VERSION-$(hostname -s).tgz" -ask_yn "Enable network using configuration stored on root filesystem?" yes -[[ $resp == y ]] && enable_network -# Offer the user the opportunity to tweak, repair, or create the network -# configuration by hand. +# Configure the network +enable_network manual_net_cfg cat <<__EOT |