GRML_SMALL/98-clean-chroot: remove "set -x" not suited for release

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

diff --git a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot b/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
index 1ff34af..6e197e6 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
@@ -1,22 +1,21 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRML_SMALL/98-clean-chroot
-# Purpose:       clean up chroot system
-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRML_SMALL/98-clean-chroot
+# Purpose:       clean up Grml chroot on grml-small
+# Authors:       (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: Mon Sep 17 17:36:11 CEST 2007 [mika]
+# License:       This file is licensed under the GPL v2.
 ################################################################################
 
-set -u
 set -e
+set -u
 
-# supported environment variables of grml_cleanup_chroot.small:
-#   NOCOLORS: if set it disables colors in (debugging) output
-#   REMOVE_DOCS: rm -rf /usr/share/doc + /usr/share/info
+echo "Removing /usr/share/ssh/blacklist.*"
+rm -f $target/usr/share/ssh/blacklist.DSA-1024 $target/usr/share/ssh/blacklist.RSA-2048
 
-cp /etc/grml/fai/grml/grml_cleanup_chroot.small $target/root/
-$ROOTCMD sh -c "NOCOLORS=1 /root/grml_cleanup_chroot.small"
-rm $target/root/grml_cleanup_chroot.small
+echo "Cleaning documentation directories"
+if [ -d $target/usr/share/doc/grml-docs ] ; then
+  mv $target/usr/share/doc/grml-docs $target/tmp/
+fi
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2