From: halex <halex@openbsd.org>
Date: Fri, 25 Apr 2014 19:34:24 +0000 (+0000)
Subject: filter excess data from autoinstall output *before* it ends up in the
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5e703e6bc61922ba32e39200e1d58615736ab7f7;p=openbsd

filter excess data from autoinstall output *before* it ends up in the
log file on the ramdisk, in order not to run out of its precious space

reported by, tested and ok sebastia@
---

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 16cce3b2aa5..73f19ae8f4c 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.767 2014/04/21 23:15:09 rpe Exp $
+#	$OpenBSD: install.sub,v 1.768 2014/04/25 19:34:24 halex Exp $
 #
 # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
 # All rights reserved.
@@ -2149,12 +2149,12 @@ elif [[ -z $respfile ]]; then
 	fi
 	rm -f /ai.done
 	echo "Performing non-interactive $action..."
-	/$action -af /$action.conf 2>&1 </dev/null | sed 'w/ai.log'
+	/$action -af /$action.conf 2>&1 </dev/null | sed 's/^.*
//;w/ai.log'
 	if [[ -f /ai.done ]]; 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
+		cp /ai.log $_lf
 		chmod 600 $_lf
 		_lf=${_lf#/mnt}
 		cat <<__EOT >>/mnt/etc/rc.firsttime