Add write_partition_layout() used to populate the
final image. Fix duplicated mkimg(1) call in vm_create_disk(). Add primitive (untested) PowerPC/PowerPC64 VM image support. Note: As it is currently written, the /boot/pmbr and /boot/{gptboot,boot1.hfs} use the build host and not the target build. Fixing this is likely going to be a hack in itself. Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
1e7c1f1742
commit
efeb11a772
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/release-vmimage/; revision=274211
@ -9,10 +9,31 @@
|
||||
export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||
trap "cleanup" INT QUIT TRAP ABRT TERM
|
||||
|
||||
mkimg_bootcode="/boot/pmbr"
|
||||
mkimg_partitions="-p freebsd-boot/bootfs:=/boot/gptboot"
|
||||
mkimg_partitions="${mkimg_partitions} -p freebsd-swap/swapfs::1G"
|
||||
mkimg_partitions="${mkimg_partitions} freebsd-ufs/rootfs:=${VMBASE}"
|
||||
write_partition_layout() {
|
||||
|
||||
case "${TARGET}:${TARGET_ARCH}" in
|
||||
amd64:amd64 | i386:i386)
|
||||
mkimg -f gpt -b /boot/pmbr \
|
||||
-p freebsd-boot/bootfs:=/boot/gptboot \
|
||||
-p freebsd-swap/swapfs::1G \
|
||||
-p freebsd-ufs/rootfs:=${VMBASE}
|
||||
-o ${VMIMAGE}
|
||||
;;
|
||||
powerpc:powerpc*)
|
||||
mkimg -f apm \
|
||||
-p freebsd-boot/bootfs:=/boot/boot1.hfs \
|
||||
-p freebsd-swap/swapfs::1G \
|
||||
-p freebsd-ufs/rootfs:=${VMBASE}
|
||||
-o ${VMIMAGE}
|
||||
;;
|
||||
*)
|
||||
# ENOTSUPP
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
usage() {
|
||||
echo "${0} usage:"
|
||||
@ -130,15 +151,8 @@ vm_create_disk() {
|
||||
fi
|
||||
echo "Creating image... Please wait."
|
||||
echo
|
||||
mkimg -f ${mkimg_format} -s ${mkimg_scheme} \
|
||||
${mkimg_bootcode} \
|
||||
${mkimg_partitions} \
|
||||
${mkimg_outfile}
|
||||
|
||||
mkimg -b /boot/pmbr -p freebsd-boot/bootfs:=/boot/gptboot \
|
||||
-p freebsd-swap/swapfs::1G \
|
||||
-p freebsd-ufs/rootfs:=${VMBASE} \
|
||||
-o ${VMIMAGE}.raw
|
||||
write_partition_layout || return 1
|
||||
|
||||
return 0
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user