X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=b95c7929ee8c55bf8b817562047080affab2c692;hb=acc4adfadf97aa83811c9bf8cd3ef52a5de985c8;hp=8acb574547e3fd60b240ccbac830fd836c031e3c;hpb=edd0442e59fdb64f2a6d046113b900c8b93c3d82;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 8acb574..b95c792 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 Dec 16 20:00:39 CET 2007 [mika]
+# Latest change: Die Jän 08 09:11:17 CET 2008 [mika]
 ################################################################################
 
 set -e
@@ -23,13 +23,6 @@ if ! ifclass NO_ONLINE ; then
    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
-   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
-
 # drop unnecessary software:
 if ifclass GRML_SMALL || ifclass DEBORPHAN ; then
    if [ -f /etc/grml/fai/grml/grml_cleanup_chroot.deborphan ] ; then
@@ -41,9 +34,19 @@ fi
 
 # make sure to drop from grml-small what's unnecessary:
 if ifclass GRML_SMALL ; then
-   $ROOTCMD apt-get -y --purge remove groff-base man-db info  man-db  manpages nano
+   for pkg in groff-base info locales man-db manpages nano; do
+     $ROOTCMD dpkg --purge $pkg || true
+   done
 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/