aboutsummaryrefslogtreecommitdiff
path: root/package/mke2img
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2014-12-28 21:11:22 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-28 22:07:39 +0100
commita869f78ed153c440342478a09640ada2069e786f (patch)
treed55b18f48d14fb7bdc124b23e4e1b61dbf3c83b5 /package/mke2img
parent09a3e7545f12d588cfb4ff1428d6bf4943e34072 (diff)
downloadbuildroot-a869f78ed153c440342478a09640ada2069e786f.tar.gz
buildroot-a869f78ed153c440342478a09640ada2069e786f.tar.bz2
package/mke2img: do not overshoot user-specified size
Currently, we forcibly expand the generated filesystem by 1300 blocks (i.e. a bit more than 1MiB) when we need to generate an ext3 or ext4 filesystem, even if the user already supplied us with the size it wants the filesystem to be. In that case, we overshoot what the user requested, which is bad because the filesystem may no longer fit in the partition it is supposed to be written into. Only add extra blocks when we do compute the required size, not when the user specifies the size. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/mke2img')
-rwxr-xr-xpackage/mke2img/mke2img10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/mke2img/mke2img b/package/mke2img/mke2img
index 9c56bc24c4..e93d8695ee 100755
--- a/package/mke2img/mke2img
+++ b/package/mke2img/mke2img
@@ -66,6 +66,12 @@ main() {
# bitmaps size + slack
nb_blocks=$(du -s -k "${root_dir}" |sed -r -e 's/[[:space:]]+.*$//')
nb_blocks=$((500+(nb_blocks+nb_inodes/8)*11/10))
+ if [ ${gen} -ge 3 ]; then
+ # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks)
+ # for the journal
+ # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
+ nb_blocks=$((nb_blocks+1300))
+ fi
fi
# Upgrade to rev1 if needed
@@ -76,10 +82,6 @@ main() {
# Add a journal for ext3 and above
if [ ${gen} -ge 3 ]; then
tune2fs_opts+=( -j -J size=1 )
- # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks)
- # for the journal
- # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
- nb_blocks=$((nb_blocks+1300))
fi
# Add ext4 specific features