X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=0f412af2d3e2160815f661e51d66af9846dae9b4;hb=1493d3449b3b6efb892cce2c71c687233cfd6b32;hp=78053dc9a1772e5b11e7bd5c67cd95064ecb77fd;hpb=e92b6377feb22631f875f3b536f9ac760a05d0e6;p=grml-live.git diff --git a/grml-live b/grml-live index 78053dc..0f412af 100755 --- a/grml-live +++ b/grml-live @@ -136,8 +136,9 @@ if [ -d "$CHROOT_TARGET" ] ; then else mkdir "$CHROOT_TARGET" || bailout 5 "Problem with creating $CHROOT_TARGET for FAI" fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS - umount $CHROOT_TARGET/proc 2>/dev/null - umount $CHROOT_TARGET/sys 2>/dev/null + umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true + umount $CHROOT_TARGET/sys 2>/dev/null || /bin/true + echo " [*] Finished execution of stage 'fai dirinstall'" fi # }}} @@ -172,7 +173,7 @@ if [ "$ARCH" = x86 ] ; then # boot.cat if [ -n "$WINDOWS_BINARIES" ] ; then if [ -d "$BUILD_TARGET"/windows ] ; then - echo " [x] $BUILD_TARGET/windows exists already - skipping stage WINDOWS_BINARIES" + echo " [x] $BUILD_TARGET/windows exists already - skipping stage 'WINDOWS_BINARIES'" return 0 else mkdir "$BUILD_TARGET"/windows @@ -181,14 +182,16 @@ if [ "$ARCH" = x86 ] ; then wget ${WINDOWS_BINARIES}/${file}.exe done ) fi + echo " [*] Finished execution of stage 'WINDOWS_BINARIES'" fi + echo " [*] Finished execution of stage 'boot/isolinux'" fi # amd64: elif [ "$ARCH" = amd64 ] ; then - echo 'Warning: gebi, it is your turn. :)'>2 + echo 'Warning: gebi, it is your turn. :)'>&2 # ppc: -elif [ "$ARCH" = ppc ] ; then - echo 'Warning: formorer, it is your turn. :)'>2 +elif [ "$ARCH" = powerpc ] ; then + echo 'Warning: formorer, it is your turn. :)'>&2 # unsuported: else echo 'Warning: Unsupported ARCH, sorry. Want to support it? Contribute!'>&2 @@ -200,6 +203,7 @@ else mkdir "$BUILD_TARGET"/live mksquashfs $CHROOT_TARGET/* $BUILD_TARGET/live/grml.squashfs -noappend fi +echo " [*] Finished execution of stage 'squashfs'" # }}} # ISO_TARGET - mkisofs {{{ @@ -214,7 +218,7 @@ else -c boot/isolinux/boot.cat -b boot/isolinux/isolinux.bin \ -o "$ISO_TARGET"/grml_0.0-1.iso . ) - + echo " [*] Finished execution of stage 'iso build'" fi # }}}