From 0c469a66c1d77ef2aff158145bb3ccec02dc361a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 5 Nov 2007 09:25:22 +0100 Subject: [PATCH] Use /etc/grml_fai_release instead of ~log/fai/release --- etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot | 2 +- grml-live | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot index 196bb66..2284637 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot +++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot @@ -45,7 +45,7 @@ fi # Remove all FAI logs from chroot via grml-live then: if ifclass RELEASE ; then - touch $target/var/log/fai/release + touch $target/etc/grml_fai_release fi ## END OF FILE ################################################################# diff --git a/grml-live b/grml-live index e755f9a..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 {{{ @@ -331,7 +331,7 @@ else 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 + if [ -f $CHROOT_OUTPUT/etc/grml_fai_release ] ; then rm -rf $CHROOT_OUTPUT/var/log/fai/* fi -- 2.1.4