Don't remove pid files in $target/var/run as it is deleted afterwards anyway.

[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 9a781b1..c5199aa 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -24,10 +24,6 @@ else
   echo "Warning: localepurg not installed"
 fi
 
-# find /var -name \*.pid
-echo "Removing pid-files"
-find $target/var/run -name \*.pid -exec rm {} \;
-
 echo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
 rm -f $target/var/lib/apt/lists/*Packages \
       $target/var/lib/apt/lists/*Release \
@@ -37,6 +33,8 @@ rm -f $target/var/lib/apt/lists/*Packages \
       $target/var/cache/apt-show-versions/* \
       $target/var/cache/debconf/templates.dat-old \
       $target/var/cache/apt/*.bin
+
+echo "Cleaning apt places"
 $ROOTCMD apt-get check 2>/dev/null
 $ROOTCMD dpkg --clear-avail
 $ROOTCMD apt-cache gencaches 2>/dev/null
@@ -66,9 +64,10 @@ fi
 
 echo "Cleaning and removing some misc files and directories"
 find $target/etc -type f -name *.pre_fcopy -delete
-rm -rf $target/etc/sysconfig/* $target/etc/motd.dpkg-* $target/etc/auto.master.*dpkg* \
+rm -rf --one-file-system $target/etc/sysconfig/* \
+       $target/etc/motd.dpkg-* $target/etc/auto.master.*dpkg* \
        $target/etc/samba/*.SID $target/etc/samba/*.tdb \
-       $target/var/run/ $target/var/log/ksymoops/* $target/var/lock/*  \
+       $target/var/run $target/var/log/ksymoops/* $target/var/lock/*  \
        $target/var/state/* $target/var/log/nessus/* \
        $target/halt $target/reboot $target/ash.static \
        $target/etc/dhcpc/*.info $target/etc/dhcpc/resolv* \
@@ -83,7 +82,7 @@ rm -rf $target/etc/sysconfig/* $target/etc/motd.dpkg-* $target/etc/auto.master.*
 # remove only "temporary" or saved files in the given directories
 nuke(){
   for i in $(find "$@" -name \*.gz -o -name \*.bz2 -o -name \*.0 2>/dev/null); do
-    rm -f "$i"
+    rm -f --one-file-system "$i"
   done
 }