diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-11 04:21:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-11 04:21:28 +0000 |
| commit | 7a1f7ce0c39fcad6bf32847efcc53c5c36c8c99b (patch) | |
| tree | 596ccf4ba85ccb2bd4df57abd1bbd8fd32d805a6 /distrib/miniroot/install.sub | |
| parent | d546dda4d3a95e94518acd6b2867d3ed568417d0 (diff) | |
krw must not have tested his dhcp change from a scratch boot
Diffstat (limited to 'distrib/miniroot/install.sub')
| -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 cee8005a7cf..dd2486e992f 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.583 2009/06/11 02:28:49 krw Exp $ +# $OpenBSD: install.sub,v 1.584 2009/06/11 04:21:27 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -743,7 +743,7 @@ v4_config() { if [[ -x /sbin/dhclient ]]; then _prompt="or 'dhcp' " # Don't make 'dhcp' the default if dhcp was already used. - ifconfig dhcp >/dev/null 2>&1 || ${_addr:=dhcp} + ifconfig dhcp >/dev/null 2>&1 || _addr=dhcp fi _prompt="IPv4 address for $_ifs? (${_prompt}or 'none')" |