mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 04:06:33 +02:00
Add disk_layout flag to image_to_vm
This allows you to build a VM image using the 4gb-rootfs layout BUG=none TEST=Build iamge using 4gb-rootfs and build VM image Change-Id: I1efa45d1448b22a9905dae764f0e4cdc0538be68 Reviewed-on: https://gerrit.chromium.org/gerrit/37489 Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Liam McLoughlin <lmcloughlin@chromium.org> Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>
This commit is contained in:
parent
ab9ca21ba0
commit
b78a7c3569
@ -24,7 +24,7 @@ DEFINE_boolean enable_rootfs_verification ${FLAGS_TRUE} \
|
||||
DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images" \
|
||||
"Directory in which to place image result directories (named by version)"
|
||||
DEFINE_string disk_layout "default" \
|
||||
"The board to build an image for."
|
||||
"The disk layout type to use for this image."
|
||||
DEFINE_boolean standard_backdoor ${FLAGS_TRUE} \
|
||||
"Install standard backdoor credentials for testing"
|
||||
DEFINE_string usb_disk /dev/sdb3 \
|
||||
|
||||
@ -37,6 +37,8 @@ DEFINE_string format "qemu" \
|
||||
"Output format, either qemu, vmware or virtualbox"
|
||||
DEFINE_string from "" \
|
||||
"Directory containing rootfs.image and mbr.image"
|
||||
DEFINE_string disk_layout "vm" \
|
||||
"The disk layout type to use for this image."
|
||||
DEFINE_boolean make_vmx ${FLAGS_TRUE} \
|
||||
"Create a vmx file for use with vmplayer (vmware only)."
|
||||
DEFINE_integer mem "${DEFAULT_MEM}" \
|
||||
@ -126,7 +128,7 @@ TEMP_KERN="${TEMP_DIR}"/part_2
|
||||
if [ -n "${FLAGS_state_image}" ]; then
|
||||
TEMP_STATE="${FLAGS_state_image}"
|
||||
else
|
||||
STATEFUL_SIZE_BYTES=$(get_filesystem_size vm 1)
|
||||
STATEFUL_SIZE_BYTES=$(get_filesystem_size "${FLAGS_disk_layout}" 1)
|
||||
STATEFUL_SIZE_MEGABYTES=$(( STATEFUL_SIZE_BYTES / 1024 / 1024 ))
|
||||
original_image_size=$(stat -c%s "${TEMP_STATE}")
|
||||
if [ "${original_image_size}" -gt "${STATEFUL_SIZE_BYTES}" ]; then
|
||||
@ -164,7 +166,7 @@ cleanup
|
||||
|
||||
# Set up a new partition table
|
||||
PARTITION_SCRIPT_PATH=$( tempfile )
|
||||
write_partition_script "vm" "${PARTITION_SCRIPT_PATH}"
|
||||
write_partition_script "${FLAGS_disk_layout}" "${PARTITION_SCRIPT_PATH}"
|
||||
. "${PARTITION_SCRIPT_PATH}"
|
||||
write_partition_table "${TEMP_IMG}" "${TEMP_PMBR}"
|
||||
rm "${PARTITION_SCRIPT_PATH}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user