Revert "Zerofree the image if possible"
This reverts commit 5184d02a7c
.
The decision was made to go with fstrim because it is faster and more
universal that zerofree. The related-id has the patchset that implements
fstrim.
Related-Id: I269b4416be450369616f9b8e030f84c30e329804
Change-Id: If40cf2fc0ecd8686768cbfeac9ecee90907674e7
This commit is contained in:
parent
5da32104b3
commit
0c32784663
@ -335,9 +335,7 @@ if [ -n "$MAX_ONLINE_RESIZE" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
LOOPDEV=$(sudo losetup --show -f $TMP_IMAGE_PATH)
|
LOOPDEV=$(sudo losetup --show -f $TMP_IMAGE_PATH)
|
||||||
# Definied here for backward compat against set -u
|
export EXTRA_UNMOUNT="detach_loopback $LOOPDEV"
|
||||||
export EXTRA_UNMOUNT=""
|
|
||||||
export EXTRA_CLEANUP="detach_loopback $LOOPDEV"
|
|
||||||
export IMAGE_BLOCK_DEVICE=$LOOPDEV
|
export IMAGE_BLOCK_DEVICE=$LOOPDEV
|
||||||
eval_run_d block-device "IMAGE_BLOCK_DEVICE="
|
eval_run_d block-device "IMAGE_BLOCK_DEVICE="
|
||||||
sudo mkfs $MKFS_OPTS -t $FS_TYPE -L ${DIB_ROOT_LABEL} ${IMAGE_BLOCK_DEVICE}
|
sudo mkfs $MKFS_OPTS -t $FS_TYPE -L ${DIB_ROOT_LABEL} ${IMAGE_BLOCK_DEVICE}
|
||||||
@ -384,13 +382,6 @@ done
|
|||||||
unmount_image
|
unmount_image
|
||||||
cleanup_build_dir
|
cleanup_build_dir
|
||||||
|
|
||||||
# Write zeros to free blocks to aid compression of images.
|
|
||||||
if echo "$FS_TYPE" | grep -q "^ext" && which zerofree ; then
|
|
||||||
sudo zerofree $IMAGE_BLOCK_DEVICE
|
|
||||||
fi
|
|
||||||
# We are done with the loopback device make sure it is detached.
|
|
||||||
$EXTRA_CLEANUP
|
|
||||||
|
|
||||||
has_raw_type=
|
has_raw_type=
|
||||||
if [ "$IS_RAMDISK" == "0" ]; then
|
if [ "$IS_RAMDISK" == "0" ]; then
|
||||||
for IMAGE_TYPE in ${IMAGE_TYPES[@]} ; do
|
for IMAGE_TYPE in ${IMAGE_TYPES[@]} ; do
|
||||||
|
@ -27,11 +27,6 @@ It is recommended you check the documentation for each element you are using
|
|||||||
to determine if there are any additional dependencies. Of particular note is
|
to determine if there are any additional dependencies. Of particular note is
|
||||||
the need for the `dev-python/pyyaml` package on Gentoo hosts.
|
the need for the `dev-python/pyyaml` package on Gentoo hosts.
|
||||||
|
|
||||||
If the zerofree utility is present on the build system and you are building
|
|
||||||
an image with an ext filesystem zerofree will be used to zero out free
|
|
||||||
blocks in the image. This makes the resulting images much smaller if
|
|
||||||
compressed.
|
|
||||||
|
|
||||||
|
|
||||||
Source Installation
|
Source Installation
|
||||||
-------------------
|
-------------------
|
||||||
|
@ -24,8 +24,6 @@ function unmount_image () {
|
|||||||
# unmount from the chroot
|
# unmount from the chroot
|
||||||
# Don't use TMP_MOUNT_PATH here, it might not have been set.
|
# Don't use TMP_MOUNT_PATH here, it might not have been set.
|
||||||
unmount_dir "$TMP_BUILD_DIR/mnt"
|
unmount_dir "$TMP_BUILD_DIR/mnt"
|
||||||
|
|
||||||
# Left here for backward compatibility
|
|
||||||
if [ -n "$EXTRA_UNMOUNT" ]; then
|
if [ -n "$EXTRA_UNMOUNT" ]; then
|
||||||
$EXTRA_UNMOUNT
|
$EXTRA_UNMOUNT
|
||||||
fi
|
fi
|
||||||
@ -41,9 +39,6 @@ function cleanup () {
|
|||||||
unmount_image
|
unmount_image
|
||||||
cleanup_build_dir
|
cleanup_build_dir
|
||||||
cleanup_image_dir
|
cleanup_image_dir
|
||||||
if [ -n "$EXTRA_CLEANUP" ]; then
|
|
||||||
$EXTRA_CLEANUP
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function ensure_nbd () {
|
function ensure_nbd () {
|
||||||
|
@ -8,10 +8,8 @@ sudo apt-get install -y \
|
|||||||
debootstrap \
|
debootstrap \
|
||||||
inetutils-ping \
|
inetutils-ping \
|
||||||
kpartx \
|
kpartx \
|
||||||
zerofree \
|
|
||||||
qemu-utils || \
|
qemu-utils || \
|
||||||
sudo yum -y install \
|
sudo yum -y install \
|
||||||
debootstrap \
|
debootstrap \
|
||||||
kpartx \
|
kpartx \
|
||||||
zerofree \
|
|
||||||
qemu-img
|
qemu-img
|
||||||
|
Loading…
Reference in New Issue
Block a user