mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-23 14:41:31 +02:00
chore(cros_make_image_bootable): remove rootfs_hash references
this was part of the kernel vblock stuff. Just remove it for now.
This commit is contained in:
parent
fc6717b653
commit
f2a0ed323e
@ -89,14 +89,6 @@ DEFINE_boolean cleanup_dirs ${FLAGS_TRUE} \
|
|||||||
DEFINE_string boot_args "noinitrd" \
|
DEFINE_string boot_args "noinitrd" \
|
||||||
"Additional boot arguments to pass to the commandline"
|
"Additional boot arguments to pass to the commandline"
|
||||||
|
|
||||||
DEFINE_integer rootfs_size 720 \
|
|
||||||
"rootfs filesystem size in MBs."
|
|
||||||
# ceil(0.1 * rootfs_size) is a good minimum.
|
|
||||||
DEFINE_integer rootfs_hash_pad 8 \
|
|
||||||
"MBs reserved at the end of the rootfs image."
|
|
||||||
|
|
||||||
DEFINE_string rootfs_hash "/tmp/rootfs.hash" \
|
|
||||||
"Path where the rootfs hash should be stored."
|
|
||||||
# TODO(taysom): when we turn on boot cache, both verification and
|
# TODO(taysom): when we turn on boot cache, both verification and
|
||||||
# bootcache should have their default be FLAGS_TRUE.
|
# bootcache should have their default be FLAGS_TRUE.
|
||||||
DEFINE_boolean enable_rootfs_verification ${FLAGS_FALSE} \
|
DEFINE_boolean enable_rootfs_verification ${FLAGS_FALSE} \
|
||||||
@ -227,34 +219,6 @@ make_image_bootable() {
|
|||||||
root_dev=$squashfs_img
|
root_dev=$squashfs_img
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local rootfs_hash_size=$(stat -c '%s' ${FLAGS_rootfs_hash})
|
|
||||||
local rootfs_fs_size=$(get_filesystem_size ${FLAGS_image_type} ${NUM_ROOTFS_A})
|
|
||||||
local rootfs_partition_size=$(get_partition_size ${FLAGS_image_type} ${NUM_ROOTFS_A})
|
|
||||||
local rootfs_hash_pad=$(( rootfs_partition_size - rootfs_fs_size ))
|
|
||||||
info "Appending rootfs.hash (${rootfs_hash_size} bytes) to the root fs"
|
|
||||||
if [[ ${rootfs_hash_size} -gt ${rootfs_hash_pad} ]]
|
|
||||||
then
|
|
||||||
die "rootfs_partition_size - rootfs_fs_size is less than the needed " \
|
|
||||||
"rootfs_hash_size (${rootfs_hash_size}), update your disk layout " \
|
|
||||||
"configuration"
|
|
||||||
fi
|
|
||||||
# Unfortunately, mount_gpt_image uses mount and not losetup to create the
|
|
||||||
# loop devices. This means that they are not the correct size. We have to
|
|
||||||
# write directly to the image to append the hash tree data.
|
|
||||||
local hash_offset="$(partoffset ${image} ${NUM_ROOTFS_A})"
|
|
||||||
if [ $FLAGS_enable_squashfs -eq $FLAGS_TRUE ]; then
|
|
||||||
rootfs_file_size=$(stat -c '%s' ${root_dev})
|
|
||||||
hash_offset=$((hash_offset + (${rootfs_file_size} / 512)))
|
|
||||||
else
|
|
||||||
hash_offset=$((hash_offset + (${rootfs_fs_size} / 512)))
|
|
||||||
fi
|
|
||||||
sudo dd bs=512 \
|
|
||||||
seek=${hash_offset} \
|
|
||||||
if="${FLAGS_rootfs_hash}" \
|
|
||||||
of="${image}" \
|
|
||||||
conv=notrunc \
|
|
||||||
status=none
|
|
||||||
|
|
||||||
# We should update the esp in place in the image.
|
# We should update the esp in place in the image.
|
||||||
local bootloader_to="${image}"
|
local bootloader_to="${image}"
|
||||||
local esp_offset="$(partoffset ${image} ${NUM_ESP})"
|
local esp_offset="$(partoffset ${image} ${NUM_ESP})"
|
||||||
@ -271,10 +235,6 @@ make_image_bootable() {
|
|||||||
--vmlinuz="${FLAGS_rootfs_mountpoint}"/boot/vmlinuz \
|
--vmlinuz="${FLAGS_rootfs_mountpoint}"/boot/vmlinuz \
|
||||||
${bootloader_to_flags}
|
${bootloader_to_flags}
|
||||||
|
|
||||||
# We don't need to keep these files around anymore.
|
|
||||||
sudo rm "${FLAGS_rootfs_hash}" "${FLAGS_output_dir}/vmlinuz.image" \
|
|
||||||
"${FLAGS_output_dir}/vmlinuz_hd.vblock"
|
|
||||||
|
|
||||||
trap - EXIT
|
trap - EXIT
|
||||||
${SCRIPTS_DIR}/mount_gpt_image.sh -u -r "${FLAGS_rootfs_mountpoint}" \
|
${SCRIPTS_DIR}/mount_gpt_image.sh -u -r "${FLAGS_rootfs_mountpoint}" \
|
||||||
-s "${FLAGS_statefulfs_mountpoint}"
|
-s "${FLAGS_statefulfs_mountpoint}"
|
||||||
@ -310,7 +270,6 @@ command line parameters are correct"
|
|||||||
|
|
||||||
# Store output and temporary files next to image.
|
# Store output and temporary files next to image.
|
||||||
FLAGS_output_dir="${IMAGE_DIR}"
|
FLAGS_output_dir="${IMAGE_DIR}"
|
||||||
FLAGS_rootfs_hash="${IMAGE_DIR}/rootfs.hash"
|
|
||||||
FLAGS_rootfs_mountpoint="${IMAGE_DIR}/rootfs_dir"
|
FLAGS_rootfs_mountpoint="${IMAGE_DIR}/rootfs_dir"
|
||||||
FLAGS_statefulfs_mountpoint="${IMAGE_DIR}/stateful_dir"
|
FLAGS_statefulfs_mountpoint="${IMAGE_DIR}/stateful_dir"
|
||||||
FLAGS_espfs_mountpoint="${IMAGE_DIR}/esp"
|
FLAGS_espfs_mountpoint="${IMAGE_DIR}/esp"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user