summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2003-08-23 22:22:03 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2003-08-23 22:22:03 +0000
commitc766b9b2643ba983634351dc23324398f79d3fa8 (patch)
treef67462a25a8935a27e4dc69b98dfb51deea59575 /distrib/miniroot
parent27f8d6fbc454e55e7f1127c642f342406d41b83c (diff)
If any interface has been configured using DHCP, assume the default route
will be set by DHCP. ok drahn@ beck@ henning@
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub3
1 files changed, 2 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 7bc89c5f1bd..9763d879c1b 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.319 2003/08/17 18:51:54 krw Exp $
+# $OpenBSD: install.sub,v 1.320 2003/08/23 22:22:02 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1591,6 +1591,7 @@ donetconfig() {
# Get/Confirm the default route.
_dr=$(route -n show | sed -ne '/^default */{s///; s/ .*//; p;}')
+ [[ -f /tmp/dhclient.conf ]] && _dr=dhcp
while : ; do
ask_until "Default route? (IP address, 'dhcp' or 'none')" "$_dr"
case $resp in