d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the .cfg files to specify the ultimate format for the images

Browse Source 
created.
This commit is contained in:
Warner Losh 2015-12-07 04:02:32 +00:00
parent 849f5467cd
commit 39fcadb2ad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=291914
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/tools/nanobsd/embedded/common
View File

@ -312,6 +312,7 @@ create_diskimage ( ) (
pprint 3 "log: ${NANO_OBJ}/_.di"
(
set -o xtrace
if [ ! -z ${NANO_NOPRIV_BUILD} ]; then
extra="-F ${NANO_OBJ}/_.metalog"
fi
@ -348,17 +349,19 @@ create_diskimage ( ) (
fi
eval $NANO_SLICE_CFG=freebsd
eval $NANO_SLICE_ROOT=freebsd
[ -z ${NANO_DISKIMAGE_FORMAT} ] || fmtarg="-f ${NANO_DISKIMAGE_FORMAT}"
[ -z ${NANO_DISKIMAGE_FORMAT} ] || fmt=".${NANO_DISKIMAGE_FORMAT}"
if [ ! -z "${NANO_SLICE_FAT}" ]; then
mkimg -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \
mkimg -a 3 ${fmtarg} -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \
-p ${s2}:=${NANO_OBJ}/_.s2 \
-p ${s3}:=${NANO_OBJ}/_.s3 \
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}${fmt}
else
# s1 is cfg, s2 is /, not sure how to make that
# boot (marked as active) with mkimg yet
mkimg -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \
mkimg -a 2 ${fmtarg} -s mbr -p ${s1}:=${NANO_OBJ}/_.s1 \
-p ${s2}:=${NANO_OBJ}/_.s2 \
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}${fmt}
fi
) > ${NANO_OBJ}/_.di 2>&1
)

1
tools/tools/nanobsd/embedded/qemu-i386.cfg
View File

@ -37,6 +37,7 @@ NANO_KERNEL=GENERIC
NANO_DRIVE=ada0
NANO_NAME=qemu-i386
NANO_DISKIMAGE_FORMAT=qcow2
export EMBED_OMIT_FAT=t
. common # Pull in common definitions, keep last