svn commit: r321638 - head/tools/tools/nanobsd
Warner Losh
imp at FreeBSD.org
Fri Jul 28 02:00:04 UTC 2017
Author: imp
Date: Fri Jul 28 02:00:03 2017
New Revision: 321638
URL: https://svnweb.freebsd.org/changeset/base/321638
Log:
Allow _.disk.image to be specified.
Submitted by: ask at develooper dot com (reworked to new structure)
PR: 199191
Sponsored by: Netflix
MFC After: 3 days
Modified:
head/tools/tools/nanobsd/defaults.sh
head/tools/tools/nanobsd/legacy.sh
Modified: head/tools/tools/nanobsd/defaults.sh
==============================================================================
--- head/tools/tools/nanobsd/defaults.sh Fri Jul 28 01:59:58 2017 (r321637)
+++ head/tools/tools/nanobsd/defaults.sh Fri Jul 28 02:00:03 2017 (r321638)
@@ -71,6 +71,7 @@ NANO_PMAKE="make -j 3"
# The default name for any image we create.
NANO_IMGNAME="_.disk.full"
+NANO_IMG1NAME="_.disk.image"
# Options to put in make.conf during buildworld only
CONF_BUILD=' '
@@ -652,7 +653,7 @@ last_orders ( ) (
# Redefine this function with any last orders you may have
# after the build completed, for instance to copy the finished
# image to a more convenient place:
- # cp ${NANO_DISKIMGDIR}/_.disk.image /home/ftp/pub/nanobsd.disk
+ # cp ${NANO_DISKIMGDIR}/${NANO_IMG1NAME} /home/ftp/pub/nanobsd.disk
true
)
@@ -919,6 +920,7 @@ set_defaults_and_export ( ) {
export_var NANO_HEADS
export_var NANO_IMAGES
export_var NANO_IMGNAME
+ export_var NANO_IMG1NAME
export_var NANO_MAKE
export_var NANO_MAKE_CONF_BUILD
export_var NANO_MAKE_CONF_INSTALL
Modified: head/tools/tools/nanobsd/legacy.sh
==============================================================================
--- head/tools/tools/nanobsd/legacy.sh Fri Jul 28 01:59:58 2017 (r321637)
+++ head/tools/tools/nanobsd/legacy.sh Fri Jul 28 02:00:03 2017 (r321638)
@@ -191,8 +191,9 @@ create_diskimage ( ) (
fi
if ${do_copyout_partition} ; then
- echo "Writing out _.disk.image..."
- dd conv=sparse if=/dev/${MD}${NANO_SLICE_ROOT} of=${NANO_DISKIMGDIR}/_.disk.image bs=64k
+ echo "Writing out ${NANO_IMG1NAME}..."
+ dd conv=sparse if=/dev/${MD}${NANO_SLICE_ROOT} \
+ of=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} bs=64k
fi
mdconfig -d -u $MD
More information about the svn-src-all
mailing list