From: deraadt Date: Mon, 27 Jun 2022 13:48:38 +0000 (+0000) Subject: install script no longer creates a dhclient.conf under any circumstances, X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2322beb42253f628844862d2785a79053432ccbd;p=openbsd install script no longer creates a dhclient.conf under any circumstances, so we do not need to copy it to the new system. --- diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 70096ddfd67..0a18fc96969 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1200 2022/06/27 11:01:41 sthen Exp $ +# $OpenBSD: install.sub,v 1.1201 2022/06/27 13:48:38 deraadt Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -2518,7 +2518,7 @@ enable_network() { local _f # Use installed network configuration files during upgrade. - for _f in dhclient.conf resolv.conf; do + for _f in resolv.conf; do if [[ -f /mnt/etc/$_f ]]; then cp /mnt/etc/$_f /etc/$_f fi