Merge "Allow overwriting old images"

This commit is contained in:
Jenkins 2014-07-15 14:52:06 +00:00 committed by Gerrit Code Review
commit 348a281795
2 changed files with 8 additions and 13 deletions

View File

@ -74,6 +74,11 @@ It's a colon (:) separated path list, and it will work in a first path/element f
first served approach. The included elements tree is used when no path is supplied,
and is added to the end of the path if a path is supplied.
By default, the image building scripts will not overwrite existing disk images,
allowing you to compare the newly built image with the existing one. To change
that behaviour, set the variable OVERWRITE\_OLD\_IMAGE to any value that isn't
0.
Requirements
============

View File

@ -43,9 +43,9 @@ function mk_build_dir () {
}
function finish_image () {
if [ -f $1 ]; then
if [ -f $1 -a ${OVERWRITE_OLD_IMAGE:-0} -eq 0 ]; then
old_image="${1%.*}"-$(date +%Y.%m.%d-%H.%M.%S).${1##*.}
echo "Old image is found. Renaming it to $old_image"
echo "Old image found. Renaming it to $old_image"
mv "$1" "$old_image"
fi
@ -57,17 +57,7 @@ function finish_image () {
}
function save_image () {
if [ -f $1 ] ; then
old_image="${1%.*}"-$(date +%Y.%m.%d-%H.%M.%S).${1##*.}
echo "Old image is found. Renaming it to $old_image"
mv "$1" "$old_image"
fi
cp $TMP_IMAGE_PATH $1
cleanup_dirs
# All done!
trap EXIT
echo "Image file $1 created..."
finish_image $1
}
function element_pre_check() {