From 8d670a0bc3b42a916623931027837650f840b068 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 7 Sep 2009 14:44:05 +0200 Subject: [PATCH] Display "Finished execution of stage 'WINDOWS_BINARIES'" only if really executed, fix grml2ram bootoption --- debian/changelog | 5 ++++- grml-live | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index beaafc2..0854ebb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,8 +36,11 @@ grml-live (0.9.22) UNRELEASED; urgency=low that are meant for manual editing (so user just has to press and edit). * Add 'pci=nomsi' to failsafe bootoption (thanks to Marc 'HE' Brockschmidt). + * Fix grml2usb bootoption in templates/boot/isolinux/grml.cfg. + * Display "Finished execution of stage 'WINDOWS_BINARIES'" only if the + according code has been executed (and do not display if skipping). - -- Michael Prokop Mon, 07 Sep 2009 14:40:41 +0200 + -- Michael Prokop Mon, 07 Sep 2009 14:43:28 +0200 grml-live (0.9.21) unstable; urgency=low diff --git a/grml-live b/grml-live index 7ed805c..b35bacd 100755 --- a/grml-live +++ b/grml-live @@ -807,9 +807,10 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then md5sum ${file}.exe > ${file}.exe.md5 done ) fi + + log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]" + einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0 fi - log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]" - einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0 fi FORCE_ISO_REBUILD=true -- 2.1.4