summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorn_hibma <n_hibma@FreeBSD.org>2009-06-18 13:56:10 +0000
committern_hibma <n_hibma@FreeBSD.org>2009-06-18 13:56:10 +0000
commitd9764744f958cbd493d6f95903eb717b3c1eda37 (patch)
tree49754b3461e22764c769e02d503f169176bf879b
parent0e44c0c1a48c63d5fae34c6e70d59001e9a771fd (diff)
downloadFreeBSD-src-d9764744f958cbd493d6f95903eb717b3c1eda37.zip
FreeBSD-src-d9764744f958cbd493d6f95903eb717b3c1eda37.tar.gz
- Don't hard code _.disk.full. Use the variable.
- _.bk should be created in MAKEOBJDIRPREFIX as well - Remove a misplaced and unnecessary message.
-rw-r--r--tools/tools/nanobsd/nanobsd.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 9ec8bef..089d0b2 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -186,7 +186,7 @@ build_kernel ( ) (
unset TARGET_BIG_ENDIAN
env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \
__MAKE_CONF=${NANO_MAKE_CONF_BUILD} KERNCONF=`basename ${NANO_KERNEL}` \
- > ${NANO_OBJ}/_.bk 2>&1
+ > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
)
)
@@ -484,7 +484,7 @@ create_i386_diskimage ( ) (
fi
if [ "${NANO_MD_BACKING}" = "swap" ] ; then
- echo "Writing out _.disk.full..."
+ echo "Writing out ${NANO_IMGNAME}..."
dd if=/dev/${MD} of=${IMG} bs=64k
fi
@@ -839,7 +839,6 @@ prune_usr
run_late_customize
if $do_image ; then
create_${NANO_ARCH}_diskimage
- echo "# Created NanoBSD disk image: ${NANO_DISKIMGDIR}/${NANO_IMGNAME}"
else
pprint 2 "Skipping image build (as instructed)"
fi
OpenPOWER on IntegriCloud