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

Merge "Don't cache debootstrap rootfs by default"

Browse Source
This commit is contained in:
Jenkins 2016-03-16 00:06:18 +00:00 committed by Gerrit Code Review
commit 3fca968164
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/debootstrap/README.rst
View File

@ -25,6 +25,11 @@ pass extra arguments to the debootstrap command used to create the
base filesystem image. If --keyring is is used in `DIB_DEBOOTSTRAP_EXTRA_ARGS`, base filesystem image. If --keyring is is used in `DIB_DEBOOTSTRAP_EXTRA_ARGS`,
it will override `DIB_APT_KEYRING` if that is used as well. it will override `DIB_APT_KEYRING` if that is used as well.
The `DIB_DEBOOTSTRAP_CACHE` variable can be used to cache the created root
filesystem. By default this is 0 (disabled) and any other value enables this.
If run in offline mode then the most recently cached rootfs is used instead of
being built.
------------------- -------------------
Note on ARM systems Note on ARM systems
------------------- -------------------

2
elements/debootstrap/root.d/08-debootstrap
View File

@ -72,7 +72,9 @@ else
${DIB_DEBIAN_DEBOOTSTRAP_SCRIPT:-}" ${DIB_DEBIAN_DEBOOTSTRAP_SCRIPT:-}"
echo Caching debootstrap result in $DEBOOTSTRAP_TARBALL echo Caching debootstrap result in $DEBOOTSTRAP_TARBALL
if [ "${DIB_DEBOOTSTRAP_CACHE:-0}" != "0" ]; then
sudo tar --numeric-owner -C $TARGET_ROOT -zcf $DEBOOTSTRAP_TARBALL --exclude='./tmp/*' . sudo tar --numeric-owner -C $TARGET_ROOT -zcf $DEBOOTSTRAP_TARBALL --exclude='./tmp/*' .
fi fi
fi
sudo rm -f ${TARGET_ROOT}/.extra_settings sudo rm -f ${TARGET_ROOT}/.extra_settings