Rework FAI logs removing

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 629fdeb..196bb66 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -43,9 +43,9 @@ if ifclass GRML_SMALL ; then
    cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
 fi
 
    cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
 fi
 

-# Remove all FAI logs from chroot:
+# Remove all FAI logs from chroot via grml-live then:

 if ifclass RELEASE ; then
 if ifclass RELEASE ; then

-   rm -rf $target/var/log/fai/*
+   touch $target/var/log/fai/release

 fi
 
 ## END OF FILE #################################################################
 fi
 
 ## END OF FILE #################################################################

diff --git a/grml-live b/grml-live
index dbc43fc..e755f9a 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -325,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
       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
    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}"
    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}"