From d7f27f0d888c5df108a8f663542f4b63304413cb Mon Sep 17 00:00:00 2001 From: krw Date: Mon, 20 Apr 2015 15:31:15 +0000 Subject: [PATCH] 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@ --- distrib/miniroot/install.sub | 6 +++--- 1 file 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 @@ -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 -- 2.20.1