1
0
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-09 00:47:30 +00:00

osbuilder: fix inconsistent calculation of fs size

This patch fixes inconsistent calculations of the rootfs size.
For `du` and `df`, `-B 1MB` is different from `-BM`. The
former is the power of 1000, and the latter is the power of
1024. So comparing them doesn't make sense. The bug may result
in a larger image than needed.

Fixes: 

Signed-off-by: Yujia Qiao <rapiz3142@gmail.com>
This commit is contained in:
Yujia Qiao 2021-09-02 15:28:41 +08:00
parent 716ab32acf
commit bfcee91164

View File

@ -242,7 +242,7 @@ calculate_required_disk_size() {
local fs_type="$2"
local block_size="$3"
readonly rootfs_size_mb=$(du -B 1MB -s "${rootfs}" | awk '{print $1}')
readonly rootfs_size_mb=$(du -B 1M -s "${rootfs}" | awk '{print $1}')
readonly image="$(mktemp)"
readonly mount_dir="$(mktemp -d)"
readonly max_tries=20