Merge branch 'ch/installrescue'

[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 4e0013a..6357c78 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -9,7 +9,7 @@
 set -u
 set -e
 
-if ! [ $(ls $target/boot/config-* 2>/dev/null) ] ; then
+if ! ls $target/boot/config-* &>/dev/null ; then
   echo "No kernel config files (/boot/config-*) found. No kernel-image package installed?" >&2
   exit 1
 fi
@@ -21,7 +21,7 @@ if [ -x $target/usr/sbin/localepurge ] ; then
   echo "Running localepurge"
   $ROOTCMD localepurge
 else
-  echo "Warning: localepurg not installed"
+  echo "Warning: localepurge not installed"
 fi
 
 # revert dpkg-divert of hooks/instsoft.GRMLBASE, which is
@@ -110,11 +110,14 @@ zero(){
 
 echo "Cleaning log and cache directories"
 nuke ${target}/var/log       ${target}/var/cache
-zero ${target}/var/local     ${target}/var/log \
-     ${target}/var/spool     ${target}/var/lib/games \
-     ${target}/var/cache/man ${target}/var/lib/nfs \
-     ${target}/var/lib/xkb   ${target}/var/mail/grml \
-     ${target}/var/account/pacct
+zero ${target}/var/account/pacct \
+     ${target}/var/cache/man \
+     ${target}/var/lib/games \
+     ${target}/var/lib/nfs   \
+     ${target}/var/lib/xkb   \
+     ${target}/var/local     \
+     ${target}/var/log       \
+     ${target}/var/mail/grml
 
 # on /run we don't have to create it
 if [ -d ${target}/var/run ] ; then