From 034d67974cb1c30abe02c68acfe6485517b24efd Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp <phk@FreeBSD.org> Date: Mon, 15 Aug 2005 18:40:28 +0000 Subject: [PATCH] Put more stuff in logfiles instead of stdout --- tools/tools/nanobsd/nanobsd.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index 4691734a6ede..87a5897aa942 100644 --- a/tools/tools/nanobsd/nanobsd.sh +++ b/tools/tools/nanobsd/nanobsd.sh @@ -110,7 +110,6 @@ build_kernel ( ) ( ) clean_world ( ) ( - set -x echo "## Clean and create world directory (${NANO_WORLDDIR})" if rm -rf ${NANO_WORLDDIR}/ > /dev/null 2>&1 ; then true @@ -163,7 +162,9 @@ install_kernel ( ) ( setup_diskless ( ) ( echo "## configure diskless setup" + echo "### log: ${MAKEOBJDIRPREFIX}/_.dl" + ( cd ${NANO_WORLDDIR} # create diskless marker file @@ -188,6 +189,7 @@ setup_diskless ( ) ( ln -s var/tmp tmp echo "/dev/${NANO_DRIVE}s1a / ufs ro 1 1" > etc/fstab + ) > ${MAKEOBJDIRPREFIX}/_.dl 2>&1 ) run_customize() ( @@ -197,7 +199,7 @@ run_customize() ( do echo "## customize \"$c\"" echo "### log: ${MAKEOBJDIRPREFIX}/_.cust.$c" - type $c + echo "### `type $c`" ( $c ) 2>&1 | tee ${MAKEOBJDIRPREFIX}/_.cust.$c done ) @@ -213,7 +215,10 @@ prune_usr() ( ) create_i386_diskimage ( ) ( + echo "## build diskimage" + echo "### log: ${MAKEOBJDIRPREFIX}/_.di" + ( echo $NANO_MEDIA $NANO_IMAGES \ $NANO_CONFSIZE $NANO_DATASIZE \ $NANO_SECTS $NANO_HEADS | @@ -305,6 +310,7 @@ create_i386_diskimage ( ) ( dd if=/dev/${MD}s1 of=${MAKEOBJDIRPREFIX}/_.disk.image bs=64k mdconfig -d -u $MD + ) > ${MAKEOBJDIRPREFIX}/_.di 2>&1 )