Improve the way deborphan works in /etc/grml/fai/grml/grml_cleanup_chroot.deborphan...

diff --git a/debian/changelog b/debian/changelog
index 4b60585..2b9b554 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-live (0.9.3) unstable; urgency=low
+
+  * Improve the way deborphan works in
+    /etc/grml/fai/grml/grml_cleanup_chroot.deborphan and
+    get rid of aptitude via
+    /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+
+ -- Michael Prokop <mika@grml.org>  Sat, 06 Sep 2008 20:05:16 +0200
+
 grml-live (0.9.2) unstable; urgency=low
 
   * Improve checks for -[no]lzma for different squashfs-tools.

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index b95c792..b5f193e 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.
-# Latest change: Die Jän 08 09:11:17 CET 2008 [mika]
+# Latest change: Sat Sep 06 20:05:02 CEST 2008 [mika]
 ################################################################################
 
 set -e
@@ -23,6 +23,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 dpkg --purge $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,13 +40,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
-   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/...)

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot.deborphan b/etc/grml/fai/grml/grml_cleanup_chroot.deborphan
index bee2917..fd7e4a1 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot.deborphan
+++ b/etc/grml/fai/grml/grml_cleanup_chroot.deborphan
@@ -4,12 +4,15 @@
 # Authors:       (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sun Dec 16 18:34:08 CET 2007 [mika]
+# Latest change: Sat Sep 06 20:03:58 CEST 2008 [mika]
 ################################################################################
 
-apt-get -y --purge remove aptitude
-apt-get -y --purge remove $(deborphan)
+# remove all packages not necessary anymore:
 apt-get -y --purge autoremove
-apt-get -y --purge remove $(deborphan)
+
+# remove packages until deborphan does not find anymore:
+while [ "$(deborphan)" != "" ] ; do
+  apt-get -y --purge remove $(deborphan)
+done
 
 ## END OF FILE #################################################################