X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=a8d807d62694aa3781d78b3e09a461adba3f785a;hb=08d8db7511b78113edfb8ef04a40706315fd73a7;hp=23836227aa47c4c6bd022a18e9a9ee0a3264c4c8;hpb=bcffb5f41ff06a54a4810fde4ed8713a1db724d0;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 2383622..a8d807d 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -4,11 +4,18 @@
 # 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: Mon Jän 07 11:33:41 CET 2008 [mika]
 ################################################################################
 
 set -e
 
+# check for policy-rc.d workaround of
+# /etc/grml/fai/config/hooks/updatebase.GRMLBASE
+if [ -r $target/usr/sbin/policy-rc.d ] ; then
+   if grep -q 'FAI_ACTION=updatebase' $target/usr/sbin/policy-rc.d ; then
+      rm -f $target/usr/sbin/policy-rc.d
+   fi
+fi
+
 # 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/
@@ -23,6 +30,14 @@ 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
@@ -32,11 +47,6 @@ if ifclass GRML_SMALL || ifclass DEBORPHAN ; then
    fi
 fi
 
-# make sure to drop from grml-small what's unnecessary:
-if ifclass GRML_SMALL ; then
-   $ROOTCMD dpkg --purge groff-base info locales man-db manpages nano
-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/...)