X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=228463796d97f817e421f62f84a36283a32dfb7c;hp=88fd997755035837ce116dd237ee48bf116046fc;hb=0c469a66c1d77ef2aff158145bb3ccec02dc361a;hpb=aadaee58928e09263952ff90543024c65d426e4f

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 88fd997..2284637 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -1,40 +1,41 @@
 #!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRML/98-clean-chroot
+# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
 # Purpose:       clean up chroot system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Wed Sep 19 13:42:19 CEST 2007 [mika]
+# Latest change: Sun Nov 04 12:11:32 CET 2007 [mika]
 ################################################################################
 
 set -e
-set -u
 
 # remove some big directories when using class LATEX_CLEANUP:
 if ifclass LATEX_CLEANUP ; then
    cp /etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup $target/root/
-   $ROOTCMD /root/grml_cleanup_chroot.latex_cleanup
+   $ROOTCMD  /root/grml_cleanup_chroot.latex_cleanup
    rm $target/root/grml_cleanup_chroot.latex_cleanup
 fi
 
 # skip tasks which require only when using class NO_ONLINE:
 if ! ifclass NO_ONLINE ; then
-   cp /etc/grml/fai/grml/grml_cleanup_chroot.no_online $target/root/
-   $ROOTCMD /root/grml_cleanup_chroot.no_online
-   rm $target/root/grml_cleanup_chroot.no_online
+   cp /etc/grml/fai/grml/grml_cleanup_chroot.online $target/root/
+   $ROOTCMD  /root/grml_cleanup_chroot.online
+   rm $target/root/grml_cleanup_chroot.online
 fi
 
 # remove /usr/share/doc, /usr/share/info,... only in class REMOVE_DOCS:
-if ifclass REMOVE_DOCS: ; then
+if ifclass REMOVE_DOCS ; then
    cp /etc/grml/fai/grml/grml_cleanup_chroot.remove_docs $target/root/
-   $ROOTCMD /root/grml_cleanup_chroot.remove_docs
+   $ROOTCMD  /root/grml_cleanup_chroot.remove_docs
    rm $target/root/grml_cleanup_chroot.remove_docs
 fi
 
 # misc cleanup:
-cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/
-$ROOTCMD /root/grml_cleanup_chroot
-rm $target/root/grml_cleanup_chroot
+if [ -f /etc/grml/fai/grml/grml_cleanup_chroot ] ; then
+   cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/
+   $ROOTCMD  /root/grml_cleanup_chroot
+   rm $target/root/grml_cleanup_chroot
+fi
 
 # make sure GRML_SMALL uses the appropriate configuration:
 if ifclass GRML_SMALL ; then
@@ -42,5 +43,10 @@ if ifclass GRML_SMALL ; then
    cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
 fi
 
+# Remove all FAI logs from chroot via grml-live then:
+if ifclass RELEASE ; then
+   touch $target/etc/grml_fai_release
+fi
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3