X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=d5fd8e34ad2d0b5675534e85eb6454dfaf957a85;hp=923277fe900c58aca3264a940836d9d639692137;hb=1cef31a85e18484353f05dc851ed101001f9c07c;hpb=1b426d8a9fe1f3a04fab168d6851734bf5e84f52

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 923277f..d5fd8e3 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -24,6 +24,21 @@ else
   echo "Warning: localepurg not installed"
 fi
 
+# revert dpkg-divert of hooks/instsoft.GRMLBASE, which is
+# used to work around /etc/kernel/postinst.d/zz-update-grub failing
+# inside openvz environment, see #597084
+if $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then
+  echo "Undoing dpkg-divert of update-grub executable"
+  $ROOTCMD rm -f /usr/sbin/update-grub
+  $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-grub
+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"
+  $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 \
@@ -123,7 +138,7 @@ else
   $ROOTCMD ldconfig
 fi
 
-if [ -x $target/usr/bin/update-menus ] ; then
+if ! [ -x $target/usr/bin/update-menus ] ; then
   echo "Warning: update-menus not installed"
 else
   echo "Updating windowmanager menus"