diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-04-13 02:52:53 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-04-13 02:52:53 +0000 |
| commit | ed11223b50a71b408c46a7cabac5462979faead0 (patch) | |
| tree | 5dc936a10b2da48eb4d3b981f5b01e68b478130b | |
| parent | 1aa7b0eba47e9452ea6454af501b33b70e05d060 (diff) | |
Display 'none' as v6 default address when no v6 address is detected.
Tighten some code.
| -rw-r--r-- | distrib/miniroot/install.sub | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 268013dc834..62d361fe607 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.378 2005/04/13 02:18:10 krw Exp $ +# $OpenBSD: install.sub,v 1.379 2005/04/13 02:52:52 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback @@ -689,15 +689,12 @@ v6_config() { [[ -x /sbin/rtsol ]] && _prompt="or 'rtsol' " _prompt="IPv6 address for $_ifs? (${_prompt}or 'none')" - ask_until "$_prompt" "$_addr" + ask_until "$_prompt" "${_addr:-none}" case $resp in none) return ;; - rtsol) if [[ ! -x /sbin/rtsol ]]; then - echo "rtsol not possible - no /sbin/rtsol." - return - fi + rtsol) [[ ! -x /sbin/rtsol ]] && { echo "No /sbin/rtsol." ; return ; } ifconfig $_ifs up rtsol -F $_ifs addhostent "::1" "$_name" |