X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=7d1239aa36c24293e3a204ebfc7b4ee0a2c73624;hb=16a29e1cd80caf1c63430038e653be3fa4258e0a;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..7d1239a 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
 # Purpose:       clean up chroot system
 # 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]
 ################################################################################
 
 set -e
@@ -23,11 +22,12 @@ 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
+# 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:
@@ -39,11 +39,14 @@ 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 apt-get -y --purge remove groff-base man-db info  man-db  manpages nano
+# 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/
@@ -54,7 +57,6 @@ fi
 # make sure GRML_SMALL uses the appropriate configuration:
 if ifclass GRML_SMALL ; then
    cp $target/etc/inittab.small $target/etc/inittab
-   cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
 fi
 
 if ifclass RELEASE ; then