hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-20 07:14:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow _.disk.image to be specified.

Browse Source 
Submitted by: ask at develooper dot com (reworked to new structure)
PR: 199191
Sponsored by: Netflix
MFC After: 3 days
This commit is contained in:
Warner Losh 2017-07-28 02:00:03 +00:00
parent 9c3163dca4
commit df6c7936fa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=321638
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/tools/nanobsd/defaults.sh
View File

@ -71,6 +71,7 @@ NANO_PMAKE="make -j 3"
# The default name for any image we create. # The default name for any image we create.
NANO_IMGNAME="_.disk.full" NANO_IMGNAME="_.disk.full"
NANO_IMG1NAME="_.disk.image"
# Options to put in make.conf during buildworld only # Options to put in make.conf during buildworld only
CONF_BUILD=' ' CONF_BUILD=' '
@ -652,7 +653,7 @@ last_orders ( ) (
# Redefine this function with any last orders you may have # Redefine this function with any last orders you may have
# after the build completed, for instance to copy the finished # after the build completed, for instance to copy the finished
# image to a more convenient place: # 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 true
) )
@ -919,6 +920,7 @@ set_defaults_and_export ( ) {
export_var NANO_HEADS export_var NANO_HEADS
export_var NANO_IMAGES export_var NANO_IMAGES
export_var NANO_IMGNAME export_var NANO_IMGNAME
export_var NANO_IMG1NAME
export_var NANO_MAKE export_var NANO_MAKE
export_var NANO_MAKE_CONF_BUILD export_var NANO_MAKE_CONF_BUILD
export_var NANO_MAKE_CONF_INSTALL export_var NANO_MAKE_CONF_INSTALL

5
tools/tools/nanobsd/legacy.sh
View File

@ -191,8 +191,9 @@ create_diskimage ( ) (
fi fi
if ${do_copyout_partition} ; then if ${do_copyout_partition} ; then
echo "Writing out _.disk.image..." echo "Writing out ${NANO_IMG1NAME}..."
dd conv=sparse if=/dev/${MD}${NANO_SLICE_ROOT} of=${NANO_DISKIMGDIR}/_.disk.image bs=64k dd conv=sparse if=/dev/${MD}${NANO_SLICE_ROOT} \
of=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} bs=64k
fi fi
mdconfig -d -u $MD mdconfig -d -u $MD