summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2017-10-22 08:23:21 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2017-10-22 08:23:21 +0000
commit44106698d91525a4b7371a0bf23d87582e5c46d4 (patch)
tree5f7a06037821c890d0f8e7e565bff1e2a0efc35b
parent67552b52d1c0bf12fd40a560a0abc8366c47dc49 (diff)
On systems without dhclient, ask IPv4 question again if 'dhcp' was choosen.
Spotted by halex@
-rw-r--r--distrib/miniroot/install.sub4
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