From f65aa0f4773f206eb502efc721e12b30fd407ba9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 26 Oct 2009 13:57:36 +0000 Subject: [PATCH] disable suse-isolinux call, kiwi 3.74 is creating isos directly --- build | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build b/build index 344ccab..1391145 100755 --- a/build +++ b/build @@ -1585,13 +1585,14 @@ for SPECFILE in "${SPECFILES[@]}" ; do if test "$imagetype" = product ; then echo "running kiwi --create-instsource..." chroot $BUILD_ROOT su -c "kiwi --root $TOPDIR/KIWIROOT -v -v --instsource-local --logfile terminal -p $TOPDIR/SOURCES --create-instsource $TOPDIR/SOURCES" - $BUILD_USER < /dev/null && BUILD_SUCCEEDED=true - for i in $BUILD_ROOT/$TOPDIR/KIWIROOT/main/* ; do - test -d "$i" || continue - n="${i##*/}" - test "$n" = scripts && continue - test "$n" != "${n%0}" && continue - chroot $BUILD_ROOT su -c "suse-isolinux $TOPDIR/KIWIROOT/main/$n $TOPDIR/KIWI/$n.iso" - $BUILD_USER - done +### This block is obsolete with current kiwi versions, only needed for kiwi 3.01 version +# for i in $BUILD_ROOT/$TOPDIR/KIWIROOT/main/* ; do +# test -d "$i" || continue +# n="${i##*/}" +# test "$n" = scripts && continue +# test "$n" != "${n%0}" && continue +# chroot $BUILD_ROOT su -c "suse-isolinux $TOPDIR/KIWIROOT/main/$n $TOPDIR/KIWI/$n.iso" - $BUILD_USER +# done else BUILD_SUCCEEDED=true if [ -z "$RUNNING_IN_VM" ]; then -- 2.7.4