From: Michael Prokop <devnull@localhost>
Date: Sun, 25 Nov 2007 21:15:11 +0000 (+0100)
Subject: Log mkisofs and squashfs cmdlines as well
X-Git-Tag: 0.0.10~3
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=eea5874d5af59cc56ae34b618bf674b40706aeb3

Log mkisofs and squashfs cmdlines as well
---

diff --git a/debian/changelog b/debian/changelog
index ea6b746..484a0cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ grml-live (0.0.10) unstable; urgency=low
     - LOGDIR is now /var/log/fai/$HOSTNAME/$FAI_ACTION_date+time
     - LOGDIR is /tmp/fai during an installation (not dirinstall), and
       will be copied to the path above at the end of an installation
-  * Log the executed FAI command line to /var/log/grml-live.log.
+  * Log the executed FAI, squashfs and mkisofs command lines to
+    /var/log/grml-live.log.
   * New option '-C <configuration_file>' for specifying a configuration
     file. Needs heavy testing though, because the files are updated
     during runtime it isn't as easy as expected to be. :-/
diff --git a/grml-live b/grml-live
index c3e8b53..e525e89 100755
--- a/grml-live
+++ b/grml-live
@@ -531,6 +531,7 @@ if [ -f "$BUILD_OUTPUT"/live/grml.squashfs -a -z "$UPDATE" ] ; then
    ewarn "$BUILD_OUTPUT/live exists already, skipping stage 'squashfs'" ; eend 0
 else
    [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live
+   log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend"
    mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend
    log "Finished execution of stage 'squashfs' [$(date)]"
    einfo "Finished execution of stage 'squashfs'" ; eend 0
@@ -558,6 +559,7 @@ else
    mkdir -p "$ISO_OUTPUT" || bailout 6 "Problem with creating $ISO_OUTPUT for stage 'iso build'"
    CURRENT_DIR=$(pwd)
    cd "$BUILD_OUTPUT" &&
+   log "mkisofs -V grml $VERSION -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."
    mkisofs -V "grml $VERSION" -publisher 'grml-live | grml.org' \
            -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table    \
            -b $BOOT_FILE \