diff options
| author |   rpe <rpe@openbsd.org> | 2016-12-28 11:11:13 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2016-12-28 11:11:13 +0000 |
| commit | d882961d8a154b4ffdbd9bb9ddce36c53bc4aac2 (patch) | |
| tree | 02af9aea0fe60044d22936f66820b907a7297cfe | |
| parent | Fix the prefer unattached session behaviour of (diff) | |
| download | wireguard-openbsd-d882961d8a154b4ffdbd9bb9ddce36c53bc4aac2.tar.xz wireguard-openbsd-d882961d8a154b4ffdbd9bb9ddce36c53bc4aac2.zip | |
Replace literal ^M with $(echo '\r') to avoid cluttering diffs.
OK halex@
fine for deraadt@
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index f7a3e8d47dd..06b89a574e1 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.937 2016/12/27 09:17:52 jca Exp $ +# $OpenBSD: install.sub,v 1.938 2016/12/28 11:11:13 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1563,7 +1563,8 @@ install_http() { # Get list of files from the server. # Assumes index file is "index.txt" for http (or proxy). # We can't use index.html since the format is server-dependent. - _file_list=$(unpriv ftp -Vo - "$_url_base/index.txt" | sed 's/^.* //;s/
//') + _file_list=$(unpriv ftp -Vo - "$_url_base/index.txt" | + sed "s/^.* //;s/$(echo '\r')//") install_files "$_url_base" "$_file_list" @@ -2956,7 +2957,8 @@ elif [[ -z $RESPFILE ]]; then fi rm -f /tmp/ai/ai.done echo "Performing non-interactive $AI_MODE..." - /$AI_MODE -af /tmp/ai/ai.$AI_MODE.conf 2>&1 </dev/null | sed 's/^.*
//;w/tmp/ai/ai.log' + /$AI_MODE -af /tmp/ai/ai.$AI_MODE.conf 2>&1 </dev/null | + sed "s/^.*$(echo '\r')//;w/tmp/ai/ai.log" if [[ -f /tmp/ai/ai.done ]]; then # Email /tmp/ai/ai.log to root on next boot. prep_root_mail /tmp/ai/ai.log "$(hostname) $AI_MODE log" |