- build all image types
authorMichael Schröder <mls@suse.de>
Wed, 26 Nov 2008 17:14:56 +0000 (17:14 +0000)
committerMichael Schröder <mls@suse.de>
Wed, 26 Nov 2008 17:14:56 +0000 (17:14 +0000)
build

diff --git a/build b/build
index 9ba9dd9..dc5963f 100755 (executable)
--- a/build
+++ b/build
@@ -1362,11 +1362,17 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                chroot $BUILD_ROOT su -c "suse-isolinux $TOPDIR/KIWIROOT/main/$n $TOPDIR/KIWI/$n.iso" - $BUILD_USER
            done
        else
-           echo "running kiwi --prepare..."
-           if chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare $TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT" - $BUILD_USER < /dev/null ; then
-               echo "running kiwi --create..."
-               chroot $BUILD_ROOT su -c "kiwi --create $TOPDIR/KIWIROOT --logfile terminal -d $TOPDIR/KIWI" - $BUILD_USER < /dev/null && BUILD_SUCCEEDED=true
-           fi
+           BUILD_SUCCEEDED=true
+           for imagetype in $imagetype ; do
+               echo "running kiwi --prepare for $imagetype..."
+               if chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare $TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT" - $BUILD_USER < /dev/null ; then
+                   echo "running kiwi --create for $imagetype..."
+                   chroot $BUILD_ROOT su -c "kiwi --create $TOPDIR/KIWIROOT --logfile terminal --type $imagetype -d $TOPDIR/KIWI" - $BUILD_USER < /dev/null || BUILD_SUCCEEDED=
+               else
+                   BUILD_SUCCEEDED=
+               fi
+               test -z "$BUILD_SUCCEEDED" && break
+           done
        fi
     fi