X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=435f1292afb7ca4f0ea63befd77413e5b2c55b88;hb=dde7410511284101d0df1541a0cf55feabbeb61a;hp=9222f274c2d0ebc0fbf70d45153c52da948b5c96;hpb=a909319fed99a591b453b235afa220ed4308b5be;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 9222f27..435f129 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
@@ -91,7 +97,16 @@ rm -rf --one-file-system $target/etc/sysconfig/* \
        $target/etc/lvm/.cache $target/etc/lvm/cache/.cache \
        $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
+
+# 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(){