do not include .raw file for vmx output with given output format
authorAdrian Schröter <adrian@suse.de>
Sun, 17 Jan 2010 09:33:11 +0000 (10:33 +0100)
committerAdrian Schröter <adrian@suse.de>
Sun, 17 Jan 2010 09:33:11 +0000 (10:33 +0100)
build_kiwi.sh

index 890a945..7ac0e0b 100644 (file)
@@ -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 \