X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=19464a2dd8c93200484d5f16fa8e93c2bf389e0a;hb=be6603053d12b4b5a8315360758a10a2bdcee860;hp=435f1292afb7ca4f0ea63befd77413e5b2c55b88;hpb=dde7410511284101d0df1541a0cf55feabbeb61a;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 435f129..19464a2 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -35,6 +35,14 @@ if $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then
   $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-grub
 fi
 
+# revert dpkg-divert of hooks/instsoft.GRMLBASE, which is
+# used to work around a grub-probe<->openvz bug
+if $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/grub-probe' ; then
+  echo "Undoing dpkg-divert of grub-probe executable"
+  $ROOTCMD rm -f /usr/sbin/grub-probe
+  $ROOTCMD dpkg-divert --rename --remove /usr/sbin/grub-probe
+fi
+
 # revert udev workaround of hooks/updatebase.GRMLBASE
 if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ; then
   echo "Removing /etc/udev/kernel-upgrade created by updatebase.GRMLBASE"
@@ -100,14 +108,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