diff options
| author |   rpe <rpe@openbsd.org> | 2017-10-22 08:23:20 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2017-10-22 08:23:20 +0000 |
| commit | d21bf9ea85350568d435fff40298a510347398be (patch) | |
| tree | ac8360ea732db8b1390605cd8353c788d551c410 | |
| parent | Add URI support to ssh, sftp and scp. For example ssh://user@host (diff) | |
| download | wireguard-openbsd-d21bf9ea85350568d435fff40298a510347398be.tar.xz wireguard-openbsd-d21bf9ea85350568d435fff40298a510347398be.zip | |
On systems without dhclient, ask IPv4 question again if 'dhcp' was choosen.
Spotted by halex@
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 62a579df00b..ef8c069588d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1040 2017/10/21 20:08:54 rpe Exp $ +# $OpenBSD: install.sub,v 1.1041 2017/10/22 08:23:20 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1041,7 +1041,7 @@ v4_config() { ;; dhcp) if [[ ! -x /sbin/dhclient ]]; then echo "DHCP not possible - no /sbin/dhclient." - $AUTO && exit 1 + $AUTO && exit 1 || continue else dhcp_request $_if "$_name" echo "dhcp" >>$_hn |