From 7c2a50e6430116b59947263b58111a6c23c93589 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 17 Jan 2010 10:33:11 +0100 Subject: [PATCH] do not include .raw file for vmx output with given output format --- build_kiwi.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_kiwi.sh b/build_kiwi.sh index 890a945..7ac0e0b 100644 --- a/build_kiwi.sh +++ b/build_kiwi.sh @@ -155,9 +155,11 @@ run_kiwi() # This option has a number of format parameters FILES="" for i in $imagename.$imagearch-$imageversion.vmx $imagename.$imagearch-$imageversion.vmdk $imagename.$imagearch-$imageversion.ovf \ - $imagename.$imagearch-$imageversion-disk*.vmdk $imagename.$imagearch-$imageversion.raw $imagename.$imagearch-$imageversion.xenconfig; do + $imagename.$imagearch-$imageversion-disk*.vmdk $imagename.$imagearch-$imageversion.xenconfig; do ls $i >& /dev/null && FILES="$FILES $i" done + # kiwi is not removing the .rar file, if a different output format is defined. Do not include it by default. + [ -z "$FILES" ] && FILES="$imagename.$imagearch-$imageversion.raw" tar cvjfS $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2 \ $FILES || cleanup_and_exit 1 sha1sum $BUILD_ROOT/$TOPDIR/KIWI/$imagename.$imagearch-$imageversion$buildnum-vmx.tar.bz2 \ -- 2.7.4