diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-04-20 15:31:16 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-04-20 15:31:16 +0000 |
| commit | 4d13a2b4c2db7e15f0d3ff9f2131319db45a9bdc (patch) | |
| tree | 7e24f3b84bf5154ee6b265f4f22153da2d513d39 | |
| parent | 3e88ccb8c1acda9346d641a682da497720a8d778 (diff) | |
Fix asking for list of http servers via '?'. The 'more' now used
on the install media does not (currently) support '-e' or other
posix nifties, but does exit after displaying the last line.
Should fix scanning for wireless networks too.
Reported by Adam Wolk on misc@.
ok deraadt@
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 7dc230b0904..7f85eb15080 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.830 2015/04/06 13:34:23 rpe Exp $ +# $OpenBSD: install.sub,v 1.831 2015/04/20 15:31:15 krw Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -808,7 +808,7 @@ ieee80211_config() { ;; \?) ieee80211_scan $_ifs | sed -n 's/^\([^ ]*\) chan .* bssid \([^ ]*\) .*$/ \1 (\2)/p' | - cat -n | more -ce + cat -n | more -c ;; *) _nwid=$resp;; esac @@ -1259,7 +1259,7 @@ install_http() { case $resp in done) return;; "?") [[ -s $HTTP_LIST ]] || continue - cat -n < $HTTP_LIST | more -ce + cat -n < $HTTP_LIST | more -c ;; +([0-9])) # A numeric hostname is ignored. A number is only used |