X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=ab6b3c81ca0c2f97c235a0a892372c9dfe528cad;hp=dbc43fc20ae13bf2dee60e0b5ca4db3ed5c4da4b;hb=0c469a66c1d77ef2aff158145bb3ccec02dc361a;hpb=896a6c8d2654fdc1b8db0bb9abf85ae3e8babec2 diff --git a/grml-live b/grml-live index dbc43fc..ab6b3c8 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Die Okt 30 00:09:42 CET 2007 [mika] +# Latest change: Mon Nov 05 09:24:45 CET 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -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 + 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/etc/grml_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}"