oops, seperate pieces coming...

1 files changed, 13 insertions, 13 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index ed2aeb67c99..8df8813db67 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,5 @@
-#	$OpenBSD: install.sub,v 1.746 2014/02/21 16:29:08 deraadt Exp $
+#	$OpenBSD: install.sub,v 1.747 2014/02/21 16:30:14 deraadt Exp $
+#	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
 # All rights reserved.
@@ -839,7 +840,7 @@ ieee80211_scan() {
 	# N.B. Skipping quoted nwid's for now
 	[[ -f $WLANLIST ]] ||
 		ifconfig $1 scan |
-		sed -n 's/^		nwid \([^"]\)/\1/p' >$WLANLIST
+		sed -n 's/^		nwid \([^"]\)/\1/p' > $WLANLIST
 	cat $WLANLIST
 }
 
@@ -1048,7 +1049,7 @@ enable_network() {
 		if=${hn#/mnt/etc/hostname.}
 
 		# Check for ifconfig'able interface.
-		(ifconfig $if||ifconfig $if create) >/dev/null 2>&1 || continue
+		(ifconfig $if||ifconfig $if create)> /dev/null 2>&1 || continue
 
 		# Now parse the hostname.* file
 		while :; do
@@ -1235,7 +1236,7 @@ install_files() {
 		# space of the selected sets to prevent overflow during the
 		# extraction.
 		_tmpfs=$( (
-			for fs in /mnt/{{,var/}tmp,home,usr{/local,}}; do
+		        for fs in /mnt/{{,var/}tmp,home,usr{/local,}}; do
 				df -k $fs 2>/dev/null | grep " $fs\$"
 			done
 			df -k
@@ -1252,7 +1253,7 @@ install_files() {
 			! _tmpsrc=$(tmpdir "$_tmpfs/sets") &&
 			_issue="Cannot create prefetch area" && break
 		else
-			_issue="Cannot determine prefetch area" && break
+			_issue="Cannot determine prefetch area" && break	
 		fi
 
 		_cfile=$_tmpsrc/SHA256
@@ -1405,11 +1406,10 @@ startftplist() {
 		# ftp.openbsd.org == 129.128.5.191 and will remain at
 		# that address for the foreseeable future.
 		ftp -Vao - "http://129.128.5.191/cgi-bin/ftplist.cgi?path=$FTPSETDIR" \
-			2>/tmp/ftplisterr >$SERVERLISTALL
+			2>/tmp/ftplisterr > $SERVERLISTALL
 
 		# Remember finish time for adjusting the received timestamp
 		echo -n $SECONDS >$SERVERLISTSEC
-		feed_random
 	) & ftppid=$!
 	set +m
 
@@ -1451,7 +1451,7 @@ install_url() {
 	if [[ -s $SERVERLISTALL ]]; then
 		_prompt="Server? (hostname, list#, 'done' or '?')"
 		sed -n "s,^${_url_type}://"'\([[A-Za-z0-9\:_][]A-Za-z0-9:._-]*\),\1,p' \
-			$SERVERLISTALL >$SERVERLIST
+			$SERVERLISTALL > $SERVERLIST
 		set -- $(sed q $SERVERLIST)
 		_server_ip=${1%%/*}
 	else
@@ -1773,7 +1773,7 @@ install_sets() {
 }
 
 update_firmware() {
-	echo "/usr/sbin/fw_update -v" >>/mnt/etc/rc.firsttime
+	echo "/usr/sbin/fw_update -v" >> /mnt/etc/rc.firsttime
 }
 
 # Create a skeletal but useful /etc/fstab from /tmp/fstab by stripping all
@@ -1980,7 +1980,7 @@ apply()
 	fi
 	if [[ $sshd_disableroot == y ]]; then
 		sed "/^#\(PermitRootLogin\) yes/s//\1 no/" \
-			< /mnt/etc/ssh/sshd_config >/tmp/sshd_config
+			< /mnt/etc/ssh/sshd_config > /tmp/sshd_config
 		cp /tmp/sshd_config /mnt/etc/ssh/sshd_config
 	fi
 	if [[ $ntpd == y ]]; then
@@ -2107,8 +2107,8 @@ finish_up() {
 
 	# Create or update pkg.conf with the new package path, if any
 	if [[ -n $PACKAGE_PATH ]]; then
-		grep -v '^[ 	]*installpath[ 	]*=' /mnt/etc/pkg.conf 2>/dev/null >/tmp/pkgconf
-		print -r -- "installpath = $PACKAGE_PATH" >>/tmp/pkgconf
+		grep -v '^[ 	]*installpath[ 	]*=' /mnt/etc/pkg.conf 2>/dev/null > /tmp/pkgconf
+		print -r -- "installpath = $PACKAGE_PATH" >> /tmp/pkgconf
 		cp /tmp/pkgconf /mnt/etc/pkg.conf
 	fi
 
@@ -2325,7 +2325,7 @@ elif [[ -z $respfile ]]; then
 		# Generate unique filename and let rc.firsttime feed it to
 		# whatever mail system we have at hand by then.
 		while _lf=/mnt/var/tmp/ai.log.$RANDOM && test -e $_lf; do done
-		sed 's/^.*
//' /ai.log >>$_lf
+		sed 's/^.*
//' /ai.log >> $_lf
 		chmod 600 $_lf
 		_lf=${_lf#/mnt}
 		cat <<__EOT >>/mnt/etc/rc.firsttime