Make sure packages are being removed before docs

diff --git a/debian/changelog b/debian/changelog
index b65e1b0..6276057 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ grml-live (0.0.14) unstable; urgency=low
     /etc/grml/fai/config/scripts/GRMLBASE/95-package-information
   * Configure apt-listchanges via new script
     /etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
     /etc/grml/fai/config/scripts/GRMLBASE/95-package-information
   * Configure apt-listchanges via new script
     /etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges

+  * Make sure packages are being removed before docs are being
+    deleted in /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot

   * Adjust buildd/functions.sh for new logging.
   * Drop findimagedupes from GRML_FULL (too many new dependencies,
     being: libgraphics-magick-perl libgraphicsmagick1 libwmf0.2-7)
   * Adjust buildd/functions.sh for new logging.
   * Drop findimagedupes from GRML_FULL (too many new dependencies,
     being: libgraphics-magick-perl libgraphicsmagick1 libwmf0.2-7)

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index c259003..d8db874 100755 (executable)
--- 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.
 # 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: Sat Dec 22 09:58:17 CET 2007 [mika]

 ################################################################################
 
 set -e
 ################################################################################
 
 set -e


@@ -23,13 +23,6 @@ if ! ifclass NO_ONLINE ; then
    rm $target/root/grml_cleanup_chroot.online
 fi
 
    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
 # drop unnecessary software:
 if ifclass GRML_SMALL || ifclass DEBORPHAN ; then
    if [ -f /etc/grml/fai/grml/grml_cleanup_chroot.deborphan ] ; then


@@ -45,6 +38,14 @@ if ifclass GRML_SMALL ; then
                     locales man-db manpages nano
 fi
 
                     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/...)
+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/
 # misc cleanup:
 if [ -f /etc/grml/fai/grml/grml_cleanup_chroot ] ; then
    cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/