X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=1a736ee4727a0fbaa4120faa053572320a99f544;hb=0533a725f51aa9759cf12312cff52a50756ba47e;hp=e435c719b41ff81bf9b84fdd4a45441b510b5ad0;hpb=d08e5220bdb647ace920fa78170d18829061cb59;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index e435c71..1a736ee 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -41,8 +41,14 @@ if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ;
   $ROOTCMD rm -f /etc/udev/kernel-upgrade
 fi
 
-echo "Updating package list"
-$ROOTCMD apt-get update
+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
@@ -94,14 +100,6 @@ rm -rf --one-file-system $target/etc/sysconfig/* \
        $target/var/lib/mysql $target/var/log/lilo_log.* $target/core* \
        $target/etc/blkid.tab
 
-# avoid data leakage into target system
-if ! [ -f "$target/etc/mtab" ]; then
-  echo "/etc/mtab does not exist or is not a regular file, not touching."
-else
-  echo "Removing /etc/mtab"
-  rm -f "$target/etc/mtab"
-fi
-
 # 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