X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=e755f9a0299f70d3ebf83242217857e004587a1e;hb=9b7e8ace98235246563f04a478ee9fb3e496c946;hp=52097768f19f331de7fbb108dc7f49e8e786b365;hpb=c5624ba39fa032cda30698121bb8775640edb965;p=grml-live-grml.git

diff --git a/grml-live b/grml-live
index 5209776..e755f9a 100755
--- a/grml-live
+++ b/grml-live
@@ -61,6 +61,7 @@ PN=$(basename $0)
 # clean exit {{{
 bailout() {
   [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+  rm -f /var/run/fai/fai_softupdate_is_running /var/run/fai/FAI_INSTALLATION_IN_PROGRESS
   [ -n "$1" ] && EXIT="$1" || EXIT="1"
   [ -n "$2" ] && eerror "$2">&2
   log "------------------------------------------------------------------------------"
@@ -324,9 +325,16 @@ else
       mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
    fi
    fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u "$HOSTNAME" $FAI_ACTION "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE
+
    log "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]"
    echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]" > $CHROOT_OUTPUT/etc/grml_version
    chmod 644 $CHROOT_OUTPUT/etc/grml_version
+
+   # Remove all FAI logs from chroot if class RELEASE is used:
+   if [ -f $CHROOT_OUTPUT/var/log/fai/release ] ; then
+      rm -rf $CHROOT_OUTPUT/var/log/fai/*
+   fi
+
    umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/sys  2>/dev/null || /bin/true
    [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
@@ -446,6 +454,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
                ( cd "$BUILD_OUTPUT"/windows
                  for file in pageant plink pscp psftp putty puttygen ; do
                     wget -O ${file}.exe ${WINDOWS_BINARIES}/${file}.exe
+                    md5sum ${WINDOWS_BINARIES}/${file}.exe > ${WINDOWS_BINARIES}/${file}.exe.md5
                  done )
             fi
          fi