X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=be8c47f567b7de4310f7a95e9c727360a86436e8;hb=d9cf14645fa29b87c5b19a8a20bd8b465454827e;hp=629fdeb1d87970cd4d6f6b0fde60b96141d43dd7;hpb=06335ed6cf5e6dad2ba8d056540957a3b3fde8e3;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 629fdeb..be8c47f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -4,7 +4,7 @@
 # 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: Sun Nov 04 12:11:32 CET 2007 [mika]
+# Latest change: Thu Sep 18 01:32:11 CEST 2008 [mika]
 ################################################################################
 
 set -e
@@ -23,13 +23,31 @@ if ! ifclass NO_ONLINE ; then
    rm $target/root/grml_cleanup_chroot.online
 fi
 
+# make sure to drop from grml-small what's unnecessary:
+if ifclass GRML_SMALL ; then
+   $ROOTCMD apt-get -y --purge remove aptitude
+   for pkg in groff-base info locales man-db manpages nano; do
+     $ROOTCMD apt-get --purge remove --yes $pkg || true
+   done
+fi
+
+# drop unnecessary software:
+if ifclass GRML_SMALL || ifclass DEBORPHAN ; then
+   if [ -f /etc/grml/fai/grml/grml_cleanup_chroot.deborphan ] ; then
+      cp /etc/grml/fai/grml/grml_cleanup_chroot.deborphan $target/root/
+      $ROOTCMD  /root/grml_cleanup_chroot.deborphan
+      rm $target/root/grml_cleanup_chroot.deborphan
+   fi
+fi
+
 # remove /usr/share/doc, /usr/share/info,... only in class REMOVE_DOCS:
+# (important: remove them *after* deinstalling packages, otherwise
+# removing packages might fail due to lack of /usr/share/man/...)
 if ifclass REMOVE_DOCS ; then
    cp /etc/grml/fai/grml/grml_cleanup_chroot.remove_docs $target/root/
    $ROOTCMD  /root/grml_cleanup_chroot.remove_docs
    rm $target/root/grml_cleanup_chroot.remove_docs
 fi
-
 # misc cleanup:
 if [ -f /etc/grml/fai/grml/grml_cleanup_chroot ] ; then
    cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/
@@ -43,9 +61,11 @@ if ifclass GRML_SMALL ; then
    cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
 fi
 
-# Remove all FAI logs from chroot:
 if ifclass RELEASE ; then
-   rm -rf $target/var/log/fai/*
+   # Remove all FAI logs from chroot via grml-live later then:
+   touch $target/etc/grml_fai_release
+   # Remove all files inside /root/ of chroot:
+   rm -rf $target/root && mkdir -m 0755 $target/root
 fi
 
 ## END OF FILE #################################################################