diff options
| author |   rpe <rpe@openbsd.org> | 2017-02-08 23:13:02 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2017-02-08 23:13:02 +0000 |
| commit | 3b4ddbed8f4ba7ffe5ae528fdff09c647590dc92 (patch) | |
| tree | ae9ec136119f463b93a7664486784c51005e21aa | |
| parent | Fix IP address schema to make space for AH tests. (diff) | |
| download | wireguard-openbsd-3b4ddbed8f4ba7ffe5ae528fdff09c647590dc92.tar.xz wireguard-openbsd-3b4ddbed8f4ba7ffe5ae528fdff09c647590dc92.zip | |
Add even more line breaks to fit to 80 columns.
| -rw-r--r-- | distrib/miniroot/install.sub | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 884f70e6ea0..6fa626a9e71 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.968 2017/02/08 22:56:01 rpe Exp $ +# $OpenBSD: install.sub,v 1.969 2017/02/08 23:13:02 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1099,7 +1099,8 @@ configure_ifs() { while :; do _vd=$(ifconfig vlan$_vl 2>&1) [[ $_vd == @(*no such interface*) ]] && break - [[ $_vd == @(*vlan: +([[:digit:]]) parent interface:*) ]] || break + [[ $_vd == @(*vlan: +([[:digit:]]) parent interface:*) ]] || + break ((_vl++)) done _vd= @@ -1145,12 +1146,14 @@ configure_ifs() { while [[ $1 == vlan+([0-9]) ]]; do shift done - ask "Which interface:tag should $_if be on?" "${_vd:=$1}:$_vi" + ask "Which interface:tag should $_if be on?" \ + "${_vd:=$1}:$_vi" _vd=${resp%%:*} _vi=${resp##*:} # Validate that $_vd is a real interface. - if ! (isin "$_vd" $_ifs && [[ $_vd != vlan+([0-9]) ]]); then + if ! (isin "$_vd" $_ifs && + [[ $_vd != vlan+([0-9]) ]]); then echo "Invalid interface choice '$_vd'" _vd= continue |