Revert "GRMLBASE/98-clean-chroot: get rid of /etc/mtab"

[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 d36013c..1a736ee 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -41,15 +41,14 @@ if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ;
   $ROOTCMD rm -f /etc/udev/kernel-upgrade
 fi
 
-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 \
-      $target/var/lib/apt/lists/*Sources \
-      $target/var/lib/apt/lists/*IndexDiff \
-      $target/var/lib/apt/lists/*.gpg \
-      $target/var/cache/apt-show-versions/* \
-      $target/var/cache/debconf/templates.dat-old \
-      $target/var/cache/apt/*.bin
+set +u
+if ifclass RELEASE ; then
+set -u
+  echo "Not updating package list as RELEASE class is set."
+else
+  echo "Updating package list"
+  $ROOTCMD apt-get update
+fi
 
 echo "Cleaning apt places"
 $ROOTCMD apt-get check 2>/dev/null
@@ -96,9 +95,10 @@ rm -rf --one-file-system $target/etc/sysconfig/* \
        $target/etc/*group- $target/var/spool/postfix/maildrop/* \
        $target/etc/*.old $target/etc/*.original \
        $target/etc/lvm/.cache $target/etc/lvm/cache/.cache \
-       $target/etc/lvm/backup/main $target/tmp/* \
+       $target/etc/lvm/backup/* $target/tmp/* \
        $target/var/tmp/* $target/var/backups/* \
-       $target/var/lib/mysql $target/var/log/lilo_log.* $target/core*
+       $target/var/lib/mysql $target/var/log/lilo_log.* $target/core* \
+       $target/etc/blkid.tab
 
 # remove only "temporary" or saved files in the given directories
 nuke(){