diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-01-25 21:27:28 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-01-25 21:27:28 +0000 |
| commit | 17c63a0727205c4918d639fa6eaae7cfa2beea4e (patch) | |
| tree | 50d247a9ef2ab15723f1032df9e328db738ec6c2 /distrib | |
| parent | e8b1b656527fc9c95b99aa0a05fead15b151f359 (diff) | |
Only copy hosts file once during upgrades. Shorten a long variable name.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index fe49a9cfa1b..c9a19f624f8 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.441 2008/11/23 01:57:06 krw Exp $ +# $OpenBSD: install.sub,v 1.442 2009/01/25 21:27:27 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback @@ -776,12 +776,12 @@ v6_defroute() { # Much of this is gratuitously stolen from /etc/netstart. enable_network() { - local _netfile _gw + local _f _gw - # Copy any required or optional files found - for _netfile in hosts dhclient.conf resolv.conf resolv.conf.tail protocols services; do - if [ -f /mnt/etc/${_netfile} ]; then - cp /mnt/etc/${_netfile} /etc/${_netfile} + # Copy any network configuration files. N.B.: hosts already copied. + for _f in dhclient.conf resolv.conf resolv.conf.tail protocols services; do + if [ -f /mnt/etc/$_f ]; then + cp /mnt/etc/$_f /etc/$_f fi done |