mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 22:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(vm_image_util): Package up /usr for pxe images.

Browse Source
This commit is contained in:
Michael Marineau 2014-03-20 11:22:38 -07:00
parent 99948ab983
commit 81367903bf
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build_library/vm_image_util.sh
View File

@ -270,22 +270,28 @@ _write_cpio_disk() {
local cpio_target="${VM_TMP_DIR}/rootcpio" local cpio_target="${VM_TMP_DIR}/rootcpio"
local dst_dir=$(_dst_dir) local dst_dir=$(_dst_dir)
local vmlinuz_name="$(_dst_name ".vmlinuz")" local vmlinuz_name="$(_dst_name ".vmlinuz")"
local base_dir="${VM_TMP_ROOT}/usr"
local squashfs="usr.squashfs"
# The STATE partition and all of its bind mounts shouldn't be # If not a /usr image pack up root instead
# packed into the squashfs image. Just ROOT and OEM. if ! mountpoint -q "${base_dir}"; then
if mountpoint -q "${VM_TMP_ROOT}/media/state"; then base_dir="${VM_TMP_ROOT}"
squashfs="newroot.squashfs"
# The STATE partition and all of its bind mounts shouldn't be
# packed into the squashfs image. Just ROOT and OEM.
sudo umount --all-targets "${VM_TMP_ROOT}/media/state" sudo umount --all-targets "${VM_TMP_ROOT}/media/state"
fi fi
# Build the squashfs, embed squashfs into a gzipped cpio # Build the squashfs, embed squashfs into a gzipped cpio
mkdir -p "${cpio_target}" mkdir -p "${cpio_target}"
pushd "${cpio_target}" >/dev/null pushd "${cpio_target}" >/dev/null
sudo mksquashfs "${VM_TMP_ROOT}" ./newroot.squashfs sudo mksquashfs "${base_dir}" "./${squashfs}"
echo ./newroot.squashfs | cpio -o -H newc | gzip > "$2" echo "./${squashfs}" | cpio -o -H newc | gzip > "$2"
popd >/dev/null popd >/dev/null
# Pull the kernel out of the root filesystem # Pull the kernel out of the filesystem
cp "${VM_TMP_ROOT}"/boot/vmlinuz "${dst_dir}/${vmlinuz_name}" cp "${base_dir}"/boot/vmlinuz "${dst_dir}/${vmlinuz_name}"
VM_GENERATED_FILES+=( "${dst_dir}/${vmlinuz_name}" ) VM_GENERATED_FILES+=( "${dst_dir}/${vmlinuz_name}" )
} }