Allow the .cfg files to specify the ultimate format for the images
created.
This commit is contained in:
parent
849f5467cd
commit
39fcadb2ad
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=291914
@ -312,6 +312,7 @@ create_diskimage ( ) (
|
|||||||
pprint 3 "log: ${NANO_OBJ}/_.di"
|
pprint 3 "log: ${NANO_OBJ}/_.di"
|
||||||
|
|
||||||
(
|
(
|
||||||
|
set -o xtrace
|
||||||
if [ ! -z ${NANO_NOPRIV_BUILD} ]; then
|
if [ ! -z ${NANO_NOPRIV_BUILD} ]; then
|
||||||
extra="-F ${NANO_OBJ}/_.metalog"
|
extra="-F ${NANO_OBJ}/_.metalog"
|
||||||
fi
|
fi
|
||||||
@ -348,17 +349,19 @@ create_diskimage ( ) (
|
|||||||
fi
|
fi
|
||||||
eval $NANO_SLICE_CFG=freebsd
|
eval $NANO_SLICE_CFG=freebsd
|
||||||
eval $NANO_SLICE_ROOT=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
|
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 ${s2}:=${NANO_OBJ}/_.s2 \
|
||||||
-p ${s3}:=${NANO_OBJ}/_.s3 \
|
-p ${s3}:=${NANO_OBJ}/_.s3 \
|
||||||
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}
|
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}${fmt}
|
||||||
else
|
else
|
||||||
# s1 is cfg, s2 is /, not sure how to make that
|
# s1 is cfg, s2 is /, not sure how to make that
|
||||||
# boot (marked as active) with mkimg yet
|
# 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 \
|
-p ${s2}:=${NANO_OBJ}/_.s2 \
|
||||||
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}
|
-o ${NANO_OBJ}/_.disk.image.${NANO_NAME}${fmt}
|
||||||
fi
|
fi
|
||||||
) > ${NANO_OBJ}/_.di 2>&1
|
) > ${NANO_OBJ}/_.di 2>&1
|
||||||
)
|
)
|
||||||
|
@ -37,6 +37,7 @@ NANO_KERNEL=GENERIC
|
|||||||
NANO_DRIVE=ada0
|
NANO_DRIVE=ada0
|
||||||
NANO_NAME=qemu-i386
|
NANO_NAME=qemu-i386
|
||||||
|
|
||||||
|
NANO_DISKIMAGE_FORMAT=qcow2
|
||||||
export EMBED_OMIT_FAT=t
|
export EMBED_OMIT_FAT=t
|
||||||
|
|
||||||
. common # Pull in common definitions, keep last
|
. common # Pull in common definitions, keep last
|
||||||
|
Loading…
Reference in New Issue
Block a user