sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use megabyte granularity for image extra space"

Browse Source
This commit is contained in:
Zuul 2019-05-15 06:51:10 +00:00 committed by Gerrit Code Review
commit 3d3ba26edd
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/lib/disk-image-create
View File

@ -381,8 +381,8 @@ else
sudo du -a -c -x ${TMP_BUILD_DIR}/built > ${du_output} sudo du -a -c -x ${TMP_BUILD_DIR}/built > ${du_output}
# the last line is the total size from "-c". # the last line is the total size from "-c".
if [ -n "$DIB_IMAGE_EXTRA_SIZE" ]; then if [ -n "$DIB_IMAGE_EXTRA_SIZE" ]; then
# add DIB_IMAGE_EXTRA_SIZE to create a bigger image as requested # add DIB_IMAGE_EXTRA_SIZE megabytes to create a bigger image as requested
du_extra_size=$(echo "$DIB_IMAGE_EXTRA_SIZE" | awk '{printf("%d\n",$1 * 1024 *1024)}') du_extra_size=$(echo "$DIB_IMAGE_EXTRA_SIZE" | awk '{printf("%d\n",$1 * 1024)}')
du_size_tmp=$(tail -n1 ${du_output} | cut -f1) du_size_tmp=$(tail -n1 ${du_output} | cut -f1)
du_size=$(echo "$du_size_tmp $du_extra_size" | awk '{print int($1 + $2)}') du_size=$(echo "$du_size_tmp $du_extra_size" | awk '{print int($1 + $2)}')
else else

2
doc/source/user_guide/building_an_image.rst
View File

@ -627,7 +627,7 @@ following arguments:
``--image-extra-size`` ``--image-extra-size``
Extra space to add when automatically calculating image size, in Extra space to add when automatically calculating image size, in
gigabytes. This overrides the default 60% scale up as described megabytes. This overrides the default 60% scale up as described
above for ``--image-size``. Can also set ``DIB_IMAGE_EXTRA_SIZE``. above for ``--image-size``. Can also set ``DIB_IMAGE_EXTRA_SIZE``.
The special node named ``mkfs_root`` is affected by the following; The special node named ``mkfs_root`` is affected by the following;

5
releasenotes/notes/image-size-padding-mb-574104d40fdd2345.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``--image-extra-size`` argument has changed from gigabytes to
megabytes to make it more practical for use on smaller images.