Further /etc/runlevel.conf related fixes.

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 98-clean-chroot

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index b5f193e..ae2d0c1 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -1,14 +1,21 @@
-#!/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: Sat Sep 06 20:05:02 CEST 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/
@@ -27,7 +34,7 @@ fi
 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
+     $ROOTCMD apt-get --purge remove --yes $pkg || true
    done
 fi
 
@@ -58,7 +65,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